You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lb...@apache.org on 2016/04/29 21:37:08 UTC
incubator-toree git commit: [skip ci] Fixes to pip release targets
Repository: incubator-toree
Updated Branches:
refs/heads/master f81cec0ca -> bff0cb9fe
[skip ci] Fixes to pip release targets
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/bff0cb9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/bff0cb9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/bff0cb9f
Branch: refs/heads/master
Commit: bff0cb9fe71b4237819e75652ec9ce49992c5a92
Parents: f81cec0
Author: Gino Bustelo <lb...@apache.org>
Authored: Fri Apr 29 14:36:57 2016 -0500
Committer: Gino Bustelo <lb...@apache.org>
Committed: Fri Apr 29 14:36:57 2016 -0500
----------------------------------------------------------------------
Makefile | 23 ++++++++++++-----------
etc/pip_install/setup.py | 2 --
etc/pip_install/toree/_version.py | 2 +-
etc/tools/verify-release | 2 +-
4 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/bff0cb9f/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2c04361..49b8498 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@
.PHONY: help clean clean-dist build dev test test-travis release pip-release bin-release dev-binder .binder-image audit audit-licenses
-VERSION?=0.1.0.dev6-incubating
+BASE_VERSION=0.1.0.dev6
+VERSION=$(BASE_VERSION)-incubating
COMMIT=$(shell git rev-parse --short=12 --verify HEAD)
ifeq (, $(findstring dev, $(VERSION)))
IS_SNAPSHOT?=false
@@ -42,7 +43,7 @@ docker run -it --rm \
endef
define GEN_PIP_PACKAGE_INFO
-printf "__version__ = '$(VERSION)'\n" >> dist/toree-pip/toree/_version.py
+printf "__version__ = '$(BASE_VERSION)'\n" >> dist/toree-pip/toree/_version.py
printf "__commit__ = '$(COMMIT)'\n" >> dist/toree-pip/toree/_version.py
endef
@@ -181,8 +182,8 @@ publish-jars:
################################################################################
# PIP PACKAGE
################################################################################
-dist/toree-pip/toree-$(VERSION).tar.gz: DOCKER_WORKDIR=/srv/toree/dist/toree-pip
-dist/toree-pip/toree-$(VERSION).tar.gz: dist/toree
+dist/toree-pip/toree-$(BASE_VERSION).tar.gz: DOCKER_WORKDIR=/srv/toree/dist/toree-pip
+dist/toree-pip/toree-$(BASE_VERSION).tar.gz: dist/toree
@mkdir -p dist/toree-pip
@cp -r dist/toree dist/toree-pip
@cp dist/toree/LICENSE dist/toree-pip/LICENSE
@@ -194,15 +195,15 @@ dist/toree-pip/toree-$(VERSION).tar.gz: dist/toree
@cp -rf etc/pip_install/* dist/toree-pip/.
@$(GEN_PIP_PACKAGE_INFO)
@$(DOCKER) $(IMAGE) python setup.py sdist --dist-dir=.
- @$(DOCKER) -p 8888:8888 --user=root $(IMAGE) bash -c 'pip install toree-$(VERSION).tar.gz && jupyter toree install'
- -@(cd dist/toree-pip; find . -not -name 'toree-$(VERSION).tar.gz' -maxdepth 1 | xargs rm -r )
+ @$(DOCKER) -p 8888:8888 --user=root $(IMAGE) bash -c 'pip install toree-$(BASE_VERSION).tar.gz && jupyter toree install'
+# -@(cd dist/toree-pip; find . -not -name 'toree-$(VERSION).tar.gz' -maxdepth 1 | xargs rm -r )
-pip-release: dist/toree-pip/toree-$(VERSION).tar.gz
+pip-release: dist/toree-pip/toree-$(BASE_VERSION).tar.gz
-dist/toree-pip/toree-$(VERSION).tar.gz.md5 dist/toree-pip/toree-$(VERSION).tar.gz.asc dist/toree-pip/toree-$(VERSION).tar.gz.sha: dist/toree-pip/toree-$(VERSION).tar.gz
- @GPG_PASSWORD='$(GPG_PASSWORD)' GPG=$(GPG) etc/tools/./sign-file dist/toree-pip/toree-$(VERSION).tar.gz
+dist/toree-pip/toree-$(BASE_VERSION).tar.gz.md5 dist/toree-pip/toree-$(BASE_VERSION).tar.gz.asc dist/toree-pip/toree-$(BASE_VERSION).tar.gz.sha: dist/toree-pip/toree-$(BASE_VERSION).tar.gz
+ @GPG_PASSWORD='$(GPG_PASSWORD)' GPG=$(GPG) etc/tools/./sign-file dist/toree-pip/toree-$(BASE_VERSION).tar.gz
-sign-pip: dist/toree-pip/toree-$(VERSION).tar.gz.md5 dist/toree-pip/toree-$(VERSION).tar.gz.asc dist/toree-pip/toree-$(VERSION).tar.gz.sha
+sign-pip: dist/toree-pip/toree-$(BASE_VERSION).tar.gz.md5 dist/toree-pip/toree-$(BASE_VERSION).tar.gz.asc dist/toree-pip/toree-$(BASE_VERSION).tar.gz.sha
publish-pip: DOCKER_WORKDIR=/srv/toree/dist/toree-pip
publish-pip: PYPI_REPO?=https://pypi.python.org/pypi
@@ -212,7 +213,7 @@ publish-pip: PYPIRC=printf "[distutils]\nindex-servers =\n\tpypi\n\n[pypi]\nrepo
publish-pip: sign-pip
@$(DOCKER) $(IMAGE) bash -c '$(PYPIRC) pip install twine && \
python setup.py register -r $(PYPI_REPO) && \
- twine upload -r pypi toree-$(VERSION).tar.gz toree-$(VERSION).tar.gz.asc'
+ twine upload -r pypi toree-$(BASE_VERSION).tar.gz toree-$(BASE_VERSION).tar.gz.asc'
################################################################################
# BIN PACKAGE
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/bff0cb9f/etc/pip_install/setup.py
----------------------------------------------------------------------
diff --git a/etc/pip_install/setup.py b/etc/pip_install/setup.py
index 87c70fd..80b1862 100644
--- a/etc/pip_install/setup.py
+++ b/etc/pip_install/setup.py
@@ -61,9 +61,7 @@ setup_args = dict(
'Intended Audience :: System Administrators',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: Apache Software License',
- 'Programming Language :: Scala',
'Programming Language :: Python',
- 'Programming Language :: R',
'Programming Language :: SQL'
]
)
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/bff0cb9f/etc/pip_install/toree/_version.py
----------------------------------------------------------------------
diff --git a/etc/pip_install/toree/_version.py b/etc/pip_install/toree/_version.py
index 6d53da5..4a0af8d 100644
--- a/etc/pip_install/toree/_version.py
+++ b/etc/pip_install/toree/_version.py
@@ -15,4 +15,4 @@
# limitations under the License.
#
-# This file is populated when doing a make release. It should be empty by default.
+# This file is populated when making the pip package. It should be empty by default.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/bff0cb9f/etc/tools/verify-release
----------------------------------------------------------------------
diff --git a/etc/tools/verify-release b/etc/tools/verify-release
index 09cc2cb..f8ac679 100755
--- a/etc/tools/verify-release
+++ b/etc/tools/verify-release
@@ -36,7 +36,7 @@ for directory in "$@"
do
# For all the files in the directory which are not signatures or checksums
- for file_to_verify in `find ${FWDIR}/${directory} -type f -not -name *.asc -not -name *.md5 -not -name *.sha -maxdepth 1`; do
+ for file_to_verify in `find ${FWDIR}/${directory} -type f -name toree-* -not -name *.asc -not -name *.md5 -not -name *.sha -maxdepth 1`; do
results="${results}\n${file_to_verify}"
# Verify the signature exists