From ef043f9f8650ddec043ff9dff9586789437e2d0f Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Tue, 2 Aug 2022 19:49:02 +0300 Subject: [PATCH] General packaging improvements --- .github/workflows/python.yml | 8 ++++---- pyproject.toml | 2 +- setup.py | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index be40dc6..8904390 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -111,7 +111,7 @@ jobs: os: - {name: 'macOS', image: 'macos-latest', wheel: 'macosx_*'} - {name: 'Windows', image: 'windows-latest', wheel: 'win_amd64'} - - {name: 'Linux', image: 'ubuntu-latest', wheel: 'manylinux_2_17_x86_64.manylinux2014_x86_64'} + - {name: 'Linux', image: 'ubuntu-latest', wheel: 'manylinux2014_x86_64'} python: - {version: '3.7', wheel: 'cp37-cp37m'} - {version: '3.8', wheel: 'cp38-cp38'} @@ -133,12 +133,12 @@ jobs: with: name: python-package-distributions path: dist/ - + - name: Install Python packages run: python -m pip install --upgrade pip pytest - name: install built wheel - run: python -m pip install dist/*-${{ matrix.python.wheel }}-${{ matrix.os.wheel }}.whl + run: python -m pip install dist/*-${{ matrix.python.wheel }}-*${{ matrix.os.wheel }}.whl shell: bash - name: test @@ -166,6 +166,6 @@ jobs: - name: Publish 📦 to PyPI if: ${{ startsWith(github.ref, 'refs/tags/') }} - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.pypi_password }} diff --git a/pyproject.toml b/pyproject.toml index a9cd5cc..09652c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=44.0.0", "wheel>=0.34.2", "Cython>=0.29.21", "setuptools_scm[toml]>=3.4"] +requires = ["setuptools>=60.0.0", "Cython>=0.29.21", "setuptools_scm[toml]>=6.4"] build-backend = "setuptools.build_meta" [tool.setuptools_scm] diff --git a/setup.py b/setup.py index 211b14c..e4a2c24 100644 --- a/setup.py +++ b/setup.py @@ -152,7 +152,9 @@ def create_extension(template, kwds): ext_module.include_dirs = custom_include_paths setup( - use_scm_version=True, + use_scm_version={ + "local_scheme": "no-local-version", + }, cmdclass={ 'build_ext': CMakeBuild, },