diff --git a/.travis.yml b/.travis.yml index 2e5aa45a2..83ae74457 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,8 @@ install: - pip -q install coveralls script: - travis_wait python setup.py test -- export PACKAGE_VERSION=$(python -c "from jira import __version__; print(__version__)") +- export PACKAGE_NAME=$(python setup.py --name) +- export PACKAGE_VERSION=$(python setup.py --version) after_success: - python travis_after_all.py - export $(cat .to_export_back) @@ -59,7 +60,7 @@ deploy: - provider: releases api_key: secure: gr9iOcQjdoAyUAim6FWKzJI9MBaJo9XKfGQGu7wdPXUFhg80Rp6GLJsowP+aU94NjXM1UQlVHDAy627WtjBlLH2SvmVEIIr7+UKBopBYuXG5jJ1m3wOZE+4f1Pqe9bqFc1DxgucqE8qF0sC24fIbNM2ToeyYrxrS6RoL2gRrX2I= - file: dist/jira-$PACKAGE_VERSION.tar.gz + file: dist/$PACKAGE_NAME-$PACKAGE_VERSION.tar.gz skip_cleanup: true on: condition: "$BUILD_LEADER = YES" diff --git a/Makefile b/Makefile index 5b7e18d19..f0491e8e4 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ all: info clean flake8 test docs upload release .PHONY: all docs upload info req PACKAGE_NAME := $(shell python setup.py --name) +PACKAGE_VERSION := $(shell python setup.py --version) PYTHON_PATH := $(shell which python) PLATFORM := $(shell uname -s | awk '{print tolower($0)}') DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) @@ -16,8 +17,8 @@ GIT_BRANCH=$(shell git branch | sed -n '/\* /s///p') endif info: + @echo "INFO: Building $(PACKAGE_NAME):$(PACKAGE_VERSION) on $(GIT_BRANCH) branch" @echo "INFO: Python $(PYTHON_VERSION) from $(PYENV_HOME) [$(CONDA)]" - @echo "INFO: Branch: $(GIT_BRANCH)" clean: @find . -name "*.pyc" -delete