diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 81eccda3..e294ba63 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -7,8 +7,8 @@ jobs: name: Build and publish Python distribution to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 - name: Build a binary wheel and a source tarball run: | python -mpip install wheel diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 2fa343a1..dc1706a1 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -14,10 +14,11 @@ jobs: - '3.8' - '3.9' - '3.10' + - '3.11' runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/setup.py b/setup.py index 08f9b3d9..b81670b8 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,6 @@ import os -import sys from setuptools import setup, find_packages -from setuptools.command.test import test as TestCommand # Hack to prevent stupid "TypeError: 'NoneType' object is not callable" error # in multiprocessing/util.py _exit_function when running `python @@ -22,25 +20,6 @@ def get_requirements(suffix=''): return rv -class PyTest(TestCommand): - - user_options = [('pytest-args=', 'a', 'Arguments to pass to py.test')] - - def initialize_options(self): - TestCommand.initialize_options(self) - self.pytest_args = [] - - def finalize_options(self): - TestCommand.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - errno = pytest.main(self.pytest_args) - sys.exit(errno) - - def read(fname): """ Utility function to read the README file. @@ -80,5 +59,4 @@ def read(fname): entry_points=""" # -*- Entry points: -*- """, - cmdclass={'test': PyTest}, ) diff --git a/tox.ini b/tox.ini index a9a3622d..0c78bbda 100644 --- a/tox.ini +++ b/tox.ini @@ -17,6 +17,7 @@ deps = https://github.com/ome/zeroc-ice-py-github-ci/releases/download/0.2.0/zeroc_ice-3.6.5-cp38-cp38-linux_x86_64.whl; platform_system=="Linux" and python_version=="3.8" https://github.com/ome/zeroc-ice-py-github-ci/releases/download/0.2.0/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl; platform_system=="Linux" and python_version=="3.9" https://github.com/ome/zeroc-ice-py-github-ci/releases/download/0.2.0/zeroc_ice-3.6.5-cp310-cp310-linux_x86_64.whl; platform_system=="Linux" and python_version=="3.10" + https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl; platform_system=="Linux" and python_version=="3.11" commands = rst-lint README.rst flake8 .