Skip to content

Commit

Permalink
ver++
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterPetrik committed Oct 18, 2019
1 parent 31b576b commit ddcd32e
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion geodiff/src/geodiff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion pygeodiff/__about__.py
Original file line number Diff line number Diff line change
@@ -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__ = '[email protected]'
__maintainer__ = 'Peter Petrik'
Expand Down
70 changes: 38 additions & 32 deletions scripts/ci/publish_pypi.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
# 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
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#from setuptools import setup
from skbuild import setup

VERSION = '0.6.2'
VERSION = '0.6.3'

setup(
name="pygeodiff",
Expand Down

0 comments on commit ddcd32e

Please sign in to comment.