- Download Diff

Summary:

Upgrade twitter/commons to pants 0.0.27.

Review Request #1513 — Created Dec. 18, 2014 and submitted Jan. 6, 2015, 5:04 a.m.

Information
Owner:	jsirois
Repository:	commons
Branch:	jsirois/pants/upgrade-0.0.26
Bugs:	339
Depends On:	~~1518~~
Commit:	6b31419...
Reviewers
Groups:	pants-reviews
People:	ity, stuhood, wickman, Yasumoto

Description

Fixup BUILDs, plugins and scripts to work with pants API changes.

Run the migrate_config tool from pants to convert many pants.ini sections
and keys. Also kill some un-needed keys.

Prepare a twitter.common.pants 0.7.0 release.

Upgrade BUILD.tools and fix code to conform to more stringent checkstyle
and jmake expectations that result.

Also upgrade to virtualenv 1.11.6 and allow custom PIP_OPTIONS to
be specified (useful for bootstrapping pants as eggs in the venv for
easy IDEA project setup to hack on pants-plugins).

BUILD.tools build-support/bin/ci.sh build-support/commons/ivy/BUILD build-support/virtualenv pants pants-plugins/3rdparty/BUILD pants-plugins/src/python/twitter/common/pants/BUILD pants-plugins/src/python/twitter/common/pants pants-plugins/src/python/twitter/common/pants pants-plugins/src/python/twitter/common/pants pants-plugins/src/python/twitter/common/pants src/thrift/com/twitter/service/BUILD pants.ini src/java/com/twitter/common/application/BUILD src/java/com/twitter/common/application/http/BUILD src/java/com/twitter/common/application/modules/BUILD src/java/com/twitter/common/args/BUILD src/java/com/twitter/common/base/BUILD src/java/com/twitter/common/checkstyle/BUILD src/java/com/twitter/common/collections/BUILD src/java/com/twitter/common/examples/hello/ma src/java/com/twitter/common/inject/BUILD src/java/com/twitter/common/io/BUILD src/java/com/twitter/common/jar/tool/BUILD src/java/com/twitter/common/junit/annotations/BUILD src/java/com/twitter/common/junit/runner/BUILD src/java/com/twitter/common/junit/runner/withretry/BUILD src/java/com/twitter/common/logging/BUILD src/java/com/twitter/common/logging/julbridge/BUILD src/java/com/twitter/common/logging/log4j/BUILD src/java/com/twitter/common/logging/scribe/BUILD src/java/com/twitter/common/memcached/BUILD src/java/com/twitter/common/metrics/BUILD src/java/com/twitter/common/net/BUILD src/java/com/twitter/common/net/http/BUILD src/java/com/twitter/common/net/http/filters/BUILD src/java/com/twitter/common/net/http/handlers/BUILD src/java/com/twitter/common/net/http/handlers/pprof/BUILD src/java/com/twitter/common/objectsize/BUILD src/java/com/twitter/common/quantity/BUILD src/java/com/twitter/common/runtime/BUILD src/java/com/twitter/common/security/unittest/BUILD src/java/com/twitter/common/stats/BUILD src/java/com/twitter/common/testing/easymock/BUILD src/java/com/twitter/common/testing/mockito/BUILD src/java/com/twitter/common/text/BUILD src/java/com/twitter/common/thrift/BUILD src/java/com/twitter/common/tools/BUILD src/java/com/twitter/common/util/BUILD src/java/com/twitter/common/util/caching/BUILD src/java/com/twitter/common/util/templating/BUILD src/java/com/twitter/common/webassets/bootstrap/BUILD src/java/com/twitter/common/webassets/jquery/BUILD src/java/com/twitter/common/zookeeper/BUILD src/java/com/twitter/common/zookeeper/guice/BUILD src/java/com/twitter/common/zookeeper/guice/client/BUILD src/java/com/twitter/common/zookeeper/guice/c src/python/twitter/common/zookeeper/test_server.py src/scala/com/twitter/common/stats/BUILD src/scala/com/twitter/common/testing/BUILD src/scala/com/twitter/common/tools/compiler/BUILD src/thrift/com/twitter/service/BUILD src/thrift/com/twitter/thrift/BUILD src/thrift/org/apache/scribe/BUILD tests/java/com/twitter/common/metrics/demo/Me tests/java/com/twitter/common/testing/BUILD tests/java/com/twitter/common/testing/{ 67 files changed, 230 insertions(+), | 6 +--
| 13 ++++--
| 22 ---------
| 2 +-
| 3 +-
| 2 +-
| 2 +-
/jvm/args/tasks/resource_mapper.py | 2 +-
/jvm/extras/register.py | 4 --
/python/commons/BUILD | 17 ++++++-
/python/commons/register.py | 20 +++++++-
=> pants-plugins/src/python/twitter/common/pants/python/commons/remote_python_thrift_fileset.py | 57 ++++++++++++++---------
| 126 +++++++++-----------------------------------------
| 4 +-
| 2 +-
| 14 +++---
| 8 ++--
| 2 +-
| 2 +-
| 2 +-
in/HelloMain.java | 2 +-
| 4 +-
| 10 ++--
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 4 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 6 +--
| 2 +-
| 2 +-
| 12 ++---
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 14 +++---
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 12 ++---
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 4 +-
| 2 +-
| 2 +-
lient/flagged/BUILD | 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 87 ++++++++++------------------------
| 2 +-
| 2 +-
tricsPrecisionDemo.java | 15 +++---
| 12 ++---
=> easymock}/EasyMockTestTest.java | 0
330 deletions(-)

Testing Done

Local CI ran green via ./build-support/bin/ci.sh.

Travis went green here: https://travis-ci.org/twitter/commons/builds/45985857

Testing Done:

		Local CI ran green via `./build-support/bin/ci.sh`.

~		Travis CI away here: https://travis-ci.org/twitter/commons/builds/44433242
	~	Travis went green here: https://travis-ci.org/twitter/commons/builds/44433242

Change Summary:

Update the CHANGELOG and fix some trailing ws.

pants-plugins/src/python/twitter/common/pants/CHANGELOG.rst | 13 +++++++++++++
pants.ini | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-) --publish

Diff:

Revision 2 (+242 -329)

Show changes

	BUILD.tools
	pants.ini
	pants
	build-support/virtualenv
	build-support/bin/ci.sh
	build-support/commons/ivy/BUILD
	pants-plugins/3rdparty/BUILD
	pants-plugins/src/python/twitter/common/pants/BUILD
	60 more

Testing Done:

		Local CI ran green via `./build-support/bin/ci.sh`.

~		Travis went green here: https://travis-ci.org/twitter/commons/builds/44433242
	~	Travis away here: https://travis-ci.org/twitter/commons/builds/44438366

Note - this is not as bad as it looks, all the src/{java,scala}/**/BUILD changes are just s|repo='build-support/commons/ivy:public'|repo=public|.

Description:

		Fixup BUILDs, plugins and scripts to work with pants API changes.

		Run the migrate_config tool from pants to convert many pants.ini sections
		and keys. Also kill some un-needed keys.

		Prepare a twitter.common.pants 0.7.0 release.

		Upgrade BUILD.tools and fix code to conform to more stringent checkstyle
		and jmake expectations that result.

		Also upgrade to virtualenv 1.11.6 and allow custom PIP_OPTIONS to
		be specified (useful for bootstrapping pants as eggs in the venv for
~		easy IDEA project setup to hack on ants-plugins).
	~	easy IDEA project setup to hack on pants-plugins).

		BUILD.tools \| 6 +--
		build-support/bin/ci.sh \| 13 ++++--
		build-support/commons/ivy/BUILD \| 22 ---------
		build-support/virtualenv \| 2 +-
		pants \| 3 +-
		pants-plugins/3rdparty/BUILD \| 2 +-
		pants-plugins/src/python/twitter/common/pants/BUILD \| 2 +-
		pants-plugins/src/python/twitter/common/pants/jvm/args/tasks/resource_mapper.py \| 2 +-
		pants-plugins/src/python/twitter/common/pants/jvm/extras/register.py \| 4 --
		pants-plugins/src/python/twitter/common/pants/python/commons/BUILD \| 17 ++++++-
		pants-plugins/src/python/twitter/common/pants/python/commons/register.py \| 20 +++++++-
		src/thrift/com/twitter/service/BUILD => pants-plugins/src/python/twitter/common/pants/python/commons/remote_python_thrift_fileset.py \| 57 ++++++++++++++---------
		pants.ini \| 126 +++++++++-----------------------------------------
		src/java/com/twitter/common/application/BUILD \| 4 +-
		src/java/com/twitter/common/application/http/BUILD \| 2 +-
		src/java/com/twitter/common/application/modules/BUILD \| 14 +++---
		src/java/com/twitter/common/args/BUILD \| 8 ++--
		src/java/com/twitter/common/base/BUILD \| 2 +-
		src/java/com/twitter/common/checkstyle/BUILD \| 2 +-
		src/java/com/twitter/common/collections/BUILD \| 2 +-
		src/java/com/twitter/common/examples/hello/main/HelloMain.java \| 2 +-
		src/java/com/twitter/common/inject/BUILD \| 4 +-
		src/java/com/twitter/common/io/BUILD \| 10 ++--
		src/java/com/twitter/common/jar/tool/BUILD \| 2 +-
		src/java/com/twitter/common/junit/annotations/BUILD \| 2 +-
		src/java/com/twitter/common/junit/runner/BUILD \| 2 +-
		src/java/com/twitter/common/junit/runner/withretry/BUILD \| 2 +-
		src/java/com/twitter/common/logging/BUILD \| 4 +-
		src/java/com/twitter/common/logging/julbridge/BUILD \| 2 +-
		src/java/com/twitter/common/logging/log4j/BUILD \| 2 +-
		src/java/com/twitter/common/logging/scribe/BUILD \| 2 +-
		src/java/com/twitter/common/memcached/BUILD \| 2 +-
		src/java/com/twitter/common/metrics/BUILD \| 2 +-
		src/java/com/twitter/common/net/BUILD \| 6 +--
		src/java/com/twitter/common/net/http/BUILD \| 2 +-
		src/java/com/twitter/common/net/http/filters/BUILD \| 2 +-
		src/java/com/twitter/common/net/http/handlers/BUILD \| 12 ++---
		src/java/com/twitter/common/net/http/handlers/pprof/BUILD \| 2 +-
		src/java/com/twitter/common/objectsize/BUILD \| 2 +-
		src/java/com/twitter/common/quantity/BUILD \| 2 +-
		src/java/com/twitter/common/runtime/BUILD \| 2 +-
		src/java/com/twitter/common/security/unittest/BUILD \| 2 +-
		src/java/com/twitter/common/stats/BUILD \| 14 +++---
		src/java/com/twitter/common/testing/easymock/BUILD \| 2 +-
		src/java/com/twitter/common/testing/mockito/BUILD \| 2 +-
		src/java/com/twitter/common/text/BUILD \| 2 +-
		src/java/com/twitter/common/thrift/BUILD \| 2 +-
		src/java/com/twitter/common/tools/BUILD \| 2 +-
		src/java/com/twitter/common/util/BUILD \| 12 ++---
		src/java/com/twitter/common/util/caching/BUILD \| 2 +-
		src/java/com/twitter/common/util/templating/BUILD \| 2 +-
		src/java/com/twitter/common/webassets/bootstrap/BUILD \| 2 +-
		src/java/com/twitter/common/webassets/jquery/BUILD \| 2 +-
		src/java/com/twitter/common/zookeeper/BUILD \| 4 +-
		src/java/com/twitter/common/zookeeper/guice/BUILD \| 2 +-
		src/java/com/twitter/common/zookeeper/guice/client/BUILD \| 2 +-
		src/java/com/twitter/common/zookeeper/guice/client/flagged/BUILD \| 2 +-
		src/python/twitter/common/zookeeper/test_server.py \| 2 +-
		src/scala/com/twitter/common/stats/BUILD \| 2 +-
		src/scala/com/twitter/common/testing/BUILD \| 2 +-
		src/scala/com/twitter/common/tools/compiler/BUILD \| 2 +-
		src/thrift/com/twitter/service/BUILD \| 87 ++++++++++------------------------
		src/thrift/com/twitter/thrift/BUILD \| 2 +-
		src/thrift/org/apache/scribe/BUILD \| 2 +-
		tests/java/com/twitter/common/metrics/demo/MetricsPrecisionDemo.java \| 15 +++---
		tests/java/com/twitter/common/testing/BUILD \| 12 ++---
		tests/java/com/twitter/common/testing/{ => easymock}/EasyMockTestTest.java \| 0
		67 files changed, 230 insertions(+), 330 deletions(-)

Testing Done:

		Local CI ran green via `./build-support/bin/ci.sh`.

~		Travis away here: https://travis-ci.org/twitter/commons/builds/44438366
	~	Travis went green here: https://travis-ci.org/twitter/commons/builds/44438366

Ship it!

```
lgtm - thanks for doing this!
```

Change Summary:

Stu since he did the 0.0.6 release edits but today I realize 0.0.6 was never published to pypi.

I could fold my CHANGELOG entries into the exiasting 0.0.6 section, revert the version bump and publish or proceed as-is. Do you have a preference or more background on the 0.0.6 ~release?

People:

+	stuhood

Change Summary:

I was hoping for at least one more ship and since 0.0.27 release is imminent, I'll probably bump this change to 0.0.27 (no API changes) as soon as https://rbcommons.com/s/twitter/r/1518/ ships.
So 1 more tiny diff coming to s/0.0.26/0.0.27/ in 2 files.

Depends On:

+	~~74891 - Prepare a release for pantsbuild.pants 0.0.27.~~

Change Summary:

Bump to 0.0.27 to pickup a python thrift handling bugfix.
pants | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-) --publish

Commit:

+	82f53bd968a62ea1d41c627ea808567af93c8fb2

Diff:

Revision 3 (+282 -307)

Show changes

	BUILD.tools
	pants.ini
	pants
	build-support/virtualenv
	build-support/bin/ci.sh
	build-support/commons/ivy/BUILD
	pants-plugins/3rdparty/BUILD
	pants-plugins/src/python/twitter/common/pants/BUILD
	60 more

Testing Done:

		Local CI ran green via `./build-support/bin/ci.sh`.

~		Travis went green here: https://travis-ci.org/twitter/commons/builds/44438366
	~	Travis CI away here: https://travis-ci.org/twitter/commons/builds/44613428

OK - PTAL. In particular I'm looking for feedback on https://rbcommons.com/s/twitter/r/1513/diff/#7
Should the release be 0.7.0 or 0.6.0?

Testing Done:

		Local CI ran green via `./build-support/bin/ci.sh`.

~		Travis CI away here: https://travis-ci.org/twitter/commons/builds/44613428
	~	Travis went green here: https://travis-ci.org/twitter/commons/builds/44613428

Summary:

-	Upgrade twitter/commons to pants 0.0.26.
+	Upgrade twitter/commons to pants 0.0.27.

Change Summary:

Merge branch 'master' of https://github.com/twitter/commons into jsirois/pants/upgrade-0.0.26 --publish

Commit:

-	82f53bd968a62ea1d41c627ea808567af93c8fb2
+	6b31419f324194d34cf3eb561e2c5799568ca9e5

Diff:

Revision 4 (+282 -307)

Show changes

	BUILD.tools
	pants.ini
	pants
	build-support/virtualenv
	build-support/bin/ci.sh
	build-support/commons/ivy/BUILD
	pants-plugins/3rdparty/BUILD
	pants-plugins/src/python/twitter/common/pants/BUILD
	60 more

Change Summary:

Merged in commons master, new CI away. I'll submit this by EOD with a green CI unless I hear back from Stu on the 0.6.0/0.7.0 question.

Testing Done:

		Local CI ran green via `./build-support/bin/ci.sh`.

~		Travis went green here: https://travis-ci.org/twitter/commons/builds/44613428
	~	Travis away here: https://travis-ci.org/twitter/commons/builds/45985857

Testing Done:

		Local CI ran green via `./build-support/bin/ci.sh`.

~		Travis away here: https://travis-ci.org/twitter/commons/builds/45985857
	~	Travis went green here: https://travis-ci.org/twitter/commons/builds/45985857

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

Thanks all - submitted at https://github.com/twitter/commons/commit/2a6aced7ce94dd5d269ac026405837ace1c87970
The twitter.common.pants plugin is also published at 0.7.0: https://pypi.python.org/pypi/twitter.common.pants/0.7.0

You have a pending review.

twitter

Teams

RBCommons

Upgrade twitter/commons to pants 0.0.27.

Testing Done:

Change Summary:

Diff:

Testing Done:

Description:

Testing Done:

Change Summary:

People:

Change Summary:

Depends On:

Change Summary:

Commit:

Diff:

Testing Done:

Testing Done:

Summary:

Change Summary:

Commit:

Diff:

Change Summary:

Testing Done:

Testing Done:

Status: Closed (submitted)