diff --git a/.travis.yml b/.travis.yml index 927140c2..d74df37f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ before_script: script: - ./scripts/ci/"$TRAVIS_OS_NAME"/build.bash after_script: -- if [ -n "$TRAVIS_TAG" ]; ./scripts/ci/publish_pypi.bash ; fi +- ./scripts/ci/publish_pypi.bash diff --git a/geodiff/src/geodiff.cpp b/geodiff/src/geodiff.cpp index 4350013f..e5b55d68 100644 --- a/geodiff/src/geodiff.cpp +++ b/geodiff/src/geodiff.cpp @@ -23,7 +23,7 @@ const char *GEODIFF_version() { - return "0.6.2"; + return "0.6.3"; } void _errorLogCallback( void *pArg, int iErrCode, const char *zMsg ) diff --git a/pygeodiff/__about__.py b/pygeodiff/__about__.py index cbed4464..d40a9eaa 100644 --- a/pygeodiff/__about__.py +++ b/pygeodiff/__about__.py @@ -1,7 +1,7 @@ __title__ = 'PyGeoDiff' __description__ = 'Diff tool for geo-spatial data' __url__ = 'https://github.com/lutraconsulting/geodiff' -__version__ = '0.6.2' +__version__ = '0.6.3' __author__ = 'Peter Petrik' __author_email__ = 'zilolv@gmail.com' __maintainer__ = 'Peter Petrik' diff --git a/scripts/ci/publish_pypi.bash b/scripts/ci/publish_pypi.bash index cb527d10..fe21f5e2 100755 --- a/scripts/ci/publish_pypi.bash +++ b/scripts/ci/publish_pypi.bash @@ -2,37 +2,43 @@ set -e -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -PWD=`pwd` - -echo -n "Publishing pygeodiff to $URL" -cd $DIR/../.. - -$DIR/clean.bash - -# publish sdist -if [ "$TRAVIS_OS_NAME" == "linux" ]; then - python3 setup.py sdist - ${PYTHON} -m twine upload dist/pygeodiff*.tar.gz --username "__token__" --password "$PYPI_TOKEN" --skip-existing -fi - -$DIR/clean.bash - -# publish wheels -if [ "$TRAVIS_OS_NAME" == "linux" ]; then - PYTHON=python3 - PLAT=manylinux2010_x86_64 - DOCKER_IMAGE=quay.io/pypa/manylinux2010_x86_64 - docker run --rm -e PLAT=$PLAT -v $DIR/../../:/io $DOCKER_IMAGE /io/scripts/ci/linux/build_wheel.bash -elif [ "$TRAVIS_OS_NAME" == "windows" ]; then - PYTHON=C:/Python38/python.exe - $DIR/windows/build_wheel.bash -else - # MacOS - PYTHON=python3 - $DIR/osx/build_wheel.bash -fi +if [ -n "$TRAVIS_TAG" ]; then + + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + PWD=`pwd` + + echo -n "Publishing pygeodiff to $URL" + cd $DIR/../.. + + $DIR/clean.bash + + # publish sdist + if [ "$TRAVIS_OS_NAME" == "linux" ]; then + python3 setup.py sdist + ${PYTHON} -m twine upload dist/pygeodiff*.tar.gz --username "__token__" --password "$PYPI_TOKEN" --skip-existing + fi -${PYTHON} -m twine upload dist/* --username "__token__" --password "$PYPI_TOKEN" --skip-existing + $DIR/clean.bash -cd $PWD \ No newline at end of file + # publish wheels + if [ "$TRAVIS_OS_NAME" == "linux" ]; then + PYTHON=python3 + PLAT=manylinux2010_x86_64 + DOCKER_IMAGE=quay.io/pypa/manylinux2010_x86_64 + docker run --rm -e PLAT=$PLAT -v $DIR/../../:/io $DOCKER_IMAGE /io/scripts/ci/linux/build_wheel.bash + elif [ "$TRAVIS_OS_NAME" == "windows" ]; then + PYTHON=C:/Python38/python.exe + $DIR/windows/build_wheel.bash + else + # MacOS + PYTHON=python3 + $DIR/osx/build_wheel.bash + fi + + ${PYTHON} -m twine upload dist/* --username "__token__" --password "$PYPI_TOKEN" --skip-existing + + cd $PWD + +else + echo "Skipping deployment, not tagged" +fi \ No newline at end of file diff --git a/setup.py b/setup.py index 85046461..19e08645 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ #from setuptools import setup from skbuild import setup -VERSION = '0.6.2' +VERSION = '0.6.3' setup( name="pygeodiff",