From ae0474859818736460faef406fb23e9be15e811e Mon Sep 17 00:00:00 2001 From: Peter Petrik Date: Wed, 9 Feb 2022 07:49:31 +0100 Subject: [PATCH] Py310 (#161) * python 3.10 * deprecate python 3.6 * add musllinux --- .github/workflows/python_packages.yml | 50 ++++++++++++++++++++------- geodiff/src/geodiff.cpp | 2 +- pygeodiff/__about__.py | 2 +- setup.py | 4 +-- 4 files changed, 41 insertions(+), 17 deletions(-) mode change 100644 => 100755 setup.py diff --git a/.github/workflows/python_packages.yml b/.github/workflows/python_packages.yml index 92a14017..2c82e3b1 100644 --- a/.github/workflows/python_packages.yml +++ b/.github/workflows/python_packages.yml @@ -6,7 +6,7 @@ jobs: name: Build wheels for manylinux_2_24 runs-on: ubuntu-latest env: - CIBW_SKIP: pp* cp27-* cp35-* *-i686 + CIBW_SKIP: pp* cp27-* cp35-* cp36-* *-i686 *musllinux* CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 CIBW_MANYLINUX_I686_IMAGE: manylinux_2_24 CIBW_BEFORE_ALL_LINUX: apt-get update -y && apt-get install libsqlite3-dev @@ -22,7 +22,7 @@ jobs: python-version: '3.8' - name: Build wheels - uses: pypa/cibuildwheel@v1.12.0 + uses: pypa/cibuildwheel@v2.3.1 - uses: actions/upload-artifact@v2 with: @@ -32,7 +32,7 @@ jobs: name: Build wheels for manylinux2014 runs-on: ubuntu-latest env: - CIBW_SKIP: pp* cp27-* cp35-* *-i686 + CIBW_SKIP: pp* cp27-* cp35-* cp36-* *-i686 *musllinux* CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_I686_IMAGE: manylinux2014 CIBW_BEFORE_ALL_LINUX: yum install -y sqlite-devel @@ -48,7 +48,31 @@ jobs: python-version: '3.8' - name: Build wheels - uses: pypa/cibuildwheel@v1.12.0 + uses: pypa/cibuildwheel@v2.3.1 + + - uses: actions/upload-artifact@v2 + with: + path: ./wheelhouse/*.whl + + build_linux_wheels_musllinux_x86_64: + name: Build wheels for musllinux_x86_64 (alpine) + runs-on: ubuntu-latest + env: + CIBW_BUILD: "*musllinux*" + CIBW_BEFORE_ALL_LINUX: apk add sqlite-dev + CIBW_BEFORE_BUILD: pip install setuptools scikit-build wheel cmake + CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()" + + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-python@v2 + name: Install Python + with: + python-version: '3.8' + + - name: Build wheels + uses: pypa/cibuildwheel@v2.3.1 - uses: actions/upload-artifact@v2 with: @@ -56,11 +80,11 @@ jobs: build_windows_wheels: name: Build wheels on windows-latest - runs-on: windows-latest + runs-on: windows-2019 env: CMAKE_GENERATOR: "Visual Studio 16 2019" SQLite3_ROOT: "C:/vcpkg/installed/x64-windows" - CIBW_SKIP: cp27-* cp35-* *-win32 + CIBW_SKIP: cp27-* cp35-* cp36-* *-win32 CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path C:/vcpkg/installed/x64-windows/bin --no-mangle-all -v -w {dest_dir} {wheel}" @@ -79,7 +103,7 @@ jobs: dir "C:/vcpkg/installed/x64-windows/bin" - name: Build wheels - uses: pypa/cibuildwheel@v1.12.0 + uses: pypa/cibuildwheel@v2.3.1 - uses: actions/upload-artifact@v2 with: @@ -87,12 +111,12 @@ jobs: build_windows_32_wheels: name: Build 32bit wheels on windows-latest - runs-on: windows-latest + runs-on: windows-2019 env: CMAKE_GENERATOR: "Visual Studio 16 2019" CMAKE_GENERATOR_PLATFORM: "Win32" SQLite3_ROOT: "C:/vcpkg/installed/x86-windows" - CIBW_SKIP: cp27-* cp35-* pp* *-win_amd64 + CIBW_SKIP: cp27-* cp35-* cp36-* pp* *-win_amd64 CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path C:/vcpkg/installed/x86-windows/bin --no-mangle-all -v -w {dest_dir} {wheel}" @@ -112,7 +136,7 @@ jobs: dir "C:/vcpkg/installed/x86-windows/bin" - name: Build wheels - uses: pypa/cibuildwheel@v1.12.0 + uses: pypa/cibuildwheel@v2.3.1 - uses: actions/upload-artifact@v2 with: @@ -123,7 +147,7 @@ jobs: runs-on: macos-latest env: SQLite3_ROOT: /usr/local/opt/sqlite - CIBW_SKIP: cp27-* cp35-* + CIBW_SKIP: cp27-* cp35-* cp36-* CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()" steps: @@ -140,7 +164,7 @@ jobs: pip install setuptools scikit-build wheel cmake nose2 - name: Build wheels - uses: pypa/cibuildwheel@v1.12.0 + uses: pypa/cibuildwheel@v2.3.1 - uses: actions/upload-artifact@v2 with: @@ -170,7 +194,7 @@ jobs: path: dist/*.tar.gz upload_pypi: - needs: [build_windows_wheels, build_linux_wheels_manylinux_2_24, build_linux_wheels_manylinux2014, build_macos_wheels, build_sdist] + needs: [build_windows_wheels, build_linux_wheels_manylinux_2_24, build_linux_wheels_manylinux2014, build_linux_wheels_musllinux_x86_64, build_macos_wheels, build_sdist] runs-on: ubuntu-latest if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') steps: diff --git a/geodiff/src/geodiff.cpp b/geodiff/src/geodiff.cpp index 5b10fdc5..0bf23b7c 100644 --- a/geodiff/src/geodiff.cpp +++ b/geodiff/src/geodiff.cpp @@ -31,7 +31,7 @@ // use scripts/update_version.py to update the version here and in other places at once const char *GEODIFF_version() { - return "1.0.5"; + return "1.0.6"; } void _errorLogCallback( void *pArg, int iErrCode, const char *zMsg ) diff --git a/pygeodiff/__about__.py b/pygeodiff/__about__.py index 7b99ceb6..3b4e0e04 100644 --- a/pygeodiff/__about__.py +++ b/pygeodiff/__about__.py @@ -2,7 +2,7 @@ __description__ = 'Diff tool for geo-spatial data' __url__ = 'https://github.com/lutraconsulting/geodiff' # use scripts/update_version.py to update the version here and in other places at once -__version__ = '1.0.5' +__version__ = '1.0.6' __author__ = 'Peter Petrik' __author_email__ = 'zilolv@gmail.com' __maintainer__ = 'Peter Petrik' diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 12e75598..f674176d --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ import platform # use scripts/update_version.py to update the version here and in other places at once -VERSION = '1.0.5' +VERSION = '1.0.6' cmake_args = [ '-DENABLE_TESTS:BOOL=OFF', @@ -36,7 +36,7 @@ cmake_source_dir="geodiff", cmake_with_sdist=False, test_suite="tests.test_project", - python_requires=">=3.6", + python_requires=">=3.7", license="License :: OSI Approved :: MIT License", classifiers=[ "Programming Language :: Python :: 3",