aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject [10/11] aurora-packaging git commit: One python_library per exported setup.py project
Date Tue, 04 Aug 2015 21:44:16 GMT
One python_library per exported setup.py project

This is a mostly red code diff and makes the pants build work similar to
how it already works in an IDE environment while minimizing duplicated
information. This change also removes the confusing versions of
`thermos` and `thermos_observer` in favor of new ones. Because of the
way "covering dependencies" were required it was easier to do this
refactor than more tactically create a working `setup_py` target for
`apache.aurora.tools` without cycles and without duplicated files.

* Remove the `apache.thermos` package.
* Rename the `apache.gen.aurora` package to `apache.aurora.thrift`.
* Rename the `apache.gen.thermos` package to `apache.thermos.thrift`.
* Introduce a new `apache.aurora.tools` package with the `thermos` and `thermos_observer`
binaries.
* Create apache.thermos.runner package, rename `thermos/bin` to `thermos/runner`.
* Remove all `*-packaged` and virtual dependency trees, as well as the phrase "covering dependencies."
* Use `_`-prefix naming convention for private target names.
* Replace manual list of targets in `make-python-sdists` with automatically-generated one
(using new convention).
* Introduce a new `apache.aurora.kerberos` package with the `kaurora` and `kaurora_admin`
binaries.
* Remove all `BUILD` files in `src/main` that don't contain an exported `setup.py` library
(except one mentioned in TODO).
* Use dictionary syntax in `with_binaries`.
* Remove unused/unreachable binaries (most `bin/` dirs under `thermos/`).
* Create blank `__init__.py` files in directories that pants warns aren't packages.
* Added `thermos` command to vagrant image.

Testing Done:
./pants test.pytest --no-fast src/test/python::
./build-support/python/make-python-sdists
./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
./build-support/python/make-pycharm-virtualenv

Manually checked that `thermos status` works.

I don't have a test environment for the debian package or the spec file.

Documentation pushed to https://github.com/kevints/aurora/blob/36972/docs/build-system.md

Bugs closed: AURORA-1381

Reviewed at https://reviews.apache.org/r/36972/


Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/1a7ef26e
Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/1a7ef26e
Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/1a7ef26e

Branch: refs/heads/master
Commit: 1a7ef26e821c24ee34e095ab230160da825a1449
Parents: 203e627
Author: Kevin Sweeney <kevints@apache.org>
Authored: Mon Aug 3 11:41:33 2015 -0700
Committer: Bill Farner <wfarner@twitter.com>
Committed: Tue Aug 4 14:07:42 2015 -0700

----------------------------------------------------------------------
 build-support/packaging/debian/rules    | 8 ++++----
 build-support/packaging/rpm/aurora.spec | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/1a7ef26e/build-support/packaging/debian/rules
----------------------------------------------------------------------
diff --git a/build-support/packaging/debian/rules b/build-support/packaging/debian/rules
index 17e00c0..d981400 100755
--- a/build-support/packaging/debian/rules
+++ b/build-support/packaging/debian/rules
@@ -31,12 +31,12 @@ __gradle_build:
 
 __pants_build:
 	mkdir -p third_party
-	$(pants) binary src/main/python/apache/aurora/admin:kaurora_admin
-	$(pants) binary src/main/python/apache/aurora/client/cli:kaurora
-	$(pants) binary src/main/python/apache/aurora/executor/bin:thermos_executor
+	$(pants) binary src/main/python/apache/aurora/executor:thermos_executor
+	$(pants) binary src/main/python/apache/aurora/kerberos:kaurora
+	$(pants) binary src/main/python/apache/aurora/kerberos:kaurora_admin
 	$(pants) binary src/main/python/apache/aurora/tools:thermos
-	$(pants) binary src/main/python/apache/thermos/bin:thermos_runner
 	$(pants) binary src/main/python/apache/aurora/tools:thermos_observer
+	$(pants) binary src/main/python/apache/thermos/runner:thermos_runner
 	build-support/embed_runner_in_executor.py
 
 override_dh_installinit:

http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/1a7ef26e/build-support/packaging/rpm/aurora.spec
----------------------------------------------------------------------
diff --git a/build-support/packaging/rpm/aurora.spec b/build-support/packaging/rpm/aurora.spec
index 7cf8de6..3003ced 100644
--- a/build-support/packaging/rpm/aurora.spec
+++ b/build-support/packaging/rpm/aurora.spec
@@ -178,12 +178,12 @@ popd
 
 # Builds Aurora client PEX binaries.
 ./pants binary src/main/python/apache/aurora/admin:aurora_admin
-./pants binary src/main/python/apache/aurora/client/cli:aurora
+./pants binary src/main/python/apache/aurora/client:aurora
 
 # Builds Aurora Thermos and GC executor PEX binaries.
-./pants binary src/main/python/apache/aurora/executor/bin:thermos_executor
+./pants binary src/main/python/apache/aurora/executor:thermos_executor
 ./pants binary src/main/python/apache/aurora/tools:thermos
-./pants binary src/main/python/apache/thermos/bin:thermos_runner
+./pants binary src/main/python/apache/thermos/runner:thermos_runner
 ./pants binary src/main/python/apache/aurora/tools:thermos_observer
 
 # Packages the Thermos runner within the Thermos executor.


Mime
View raw message