From ef679e8517e47a137a3cfdd5dd9be4120caef7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Gei=C3=9F?= Date: Tue, 18 Jun 2024 16:58:09 +0200 Subject: [PATCH] Add support for newer python versions --- .github/workflows/python-package.yml | 57 +++++++++++++--------------- setup.py | 5 ++- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index c54eab9..63be264 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,35 +15,32 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] - python-version: [3.7, 3.8, 3.9, '3.10'] - include: - - os: ubuntu-20.04 - python-version: 3.6 + os: [ ubuntu-latest ] + python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11', '3.12' ] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install autopep8 pytest pytest-cov - pip install . - - name: autopep8 - id: autopep8 - uses: peter-evans/autopep8@v1 - with: - args: --recursive --in-place --aggressive --aggressive . - - name: Test with pytest - run: | - cd test - pytest . --doctest-modules --junitxml=junit/test-results-${{ matrix.python-version }}.xml --cov=com --cov-report=xml - - name: Upload pytest test results - uses: actions/upload-artifact@v2 - with: - name: pytest-results-${{ matrix.python-version }} - path: /home/runner/work/pycubexr/pycubexr/test/junit/test-results-${{ matrix.python-version }}.xml - if: ${{ always() }} + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install autopep8 pytest pytest-cov + pip install . + - name: autopep8 + id: autopep8 + uses: peter-evans/autopep8@v1 + with: + args: --recursive --in-place --aggressive --aggressive . + - name: Test with pytest + run: | + cd test + pytest . --doctest-modules --junitxml=junit/test-results-${{ matrix.python-version }}.xml --cov=com --cov-report=xml + - name: Upload pytest test results + uses: actions/upload-artifact@v2 + with: + name: pytest-results-${{ matrix.python-version }} + path: /home/runner/work/pycubexr/pycubexr/test/junit/test-results-${{ matrix.python-version }}.xml + if: ${{ always() }} diff --git a/setup.py b/setup.py index f94c0ca..e1d7cbd 100644 --- a/setup.py +++ b/setup.py @@ -17,11 +17,12 @@ "Development Status :: 5 - Production/Stable", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Intended Audience :: Developers", @@ -30,7 +31,7 @@ "Topic :: Software Development", "Topic :: Software Development :: Libraries :: Python Modules", ], - python_requires='>=3.6', + python_requires='>=3.7', install_requires=[ "numpy~=1.18" ]