diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index baf6afd0..55ea34a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,16 +16,10 @@ jobs: tox_tests: name: tox -e ${{ matrix.toxenv }} - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: include: - - python-version: '2.7' - toxenv: 'py27-test-nopyx' - - - python-version: '2.7' - toxenv: 'py27-test' - - python-version: '3.6' toxenv: 'py36-test' @@ -41,6 +35,9 @@ jobs: - python-version: '3.10' toxenv: 'py310-test' + - python-version: '3.11' + toxenv: 'py311-test' + - python-version: 'pypy-3.7' toxenv: 'pypy3-test' @@ -68,7 +65,7 @@ jobs: pip install -U pip # so that we can use wheels # tox creates the sdist: we need cython to be installed in the env which # creates the sdist, to generate the .c files - pip install tox cython>=0.29.21 + pip install tox==3.28.0 cython>=0.29.30 - name: Run tox run: tox -e ${{ matrix.toxenv }} diff --git a/.gitignore b/.gitignore index 82029a54..d8974429 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,13 @@ # these are the files produced by cython when building inplace capnpy/*.c capnpy/*.html +capnpy/*.so capnpy/segment/*.c capnpy/segment/*.html -travis/travis.rsa \ No newline at end of file +capnpy/segment/*.so +capnpy.egg-info +travis/travis.rsa + +build +__pycache__ +.tox diff --git a/.travis.yml b/.travis.yml index b874561c..007e10ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ install: - pip install tox-travis # tox creates the sdist: we need cython to be installed in the env which # creates the sdist, to generate the .c files - - pip install cython>=0.25 + - pip install cython>=0.29.30 script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./travis/clone-benchmarks-repo.sh; fi diff --git a/Makefile b/Makefile index 220f9001..adac80fa 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ annotate: schema: annotate python -m capnpy compile capnpy/schema.capnp --no-pyx --no-convert-case --no-version-check --no-reflection -# run only python2 and python3 tests: this should good enough to be checked +# run only python3 tests: this should good enough to be checked # locally before pushing and run the whole tests on travis test: - tox -e py27-test,py36-test,py37-test,py38-test + tox -e py36-test,py37-test,py38-test diff --git a/setup.py b/setup.py index c963e31a..f12e02f4 100644 --- a/setup.py +++ b/setup.py @@ -65,8 +65,8 @@ def my_cythonize(extensions): try: import Cython - if Cython.__version__ < '0.29.21': - print ('WARNING: required cython>0.29.21, found %s. The .c files will ' + if Cython.__version__ < '0.29.30': + print ('WARNING: required cython>0.29.30, found %s. The .c files will ' 'NOT be regenerated' % Cython.__version__) raise ImportError from Cython.Build import cythonize @@ -163,7 +163,7 @@ def getext(fname): if USE_CYTHON: ext_modules = get_cython_extensions() - extra_install_requires = ['cython>=0.25'] + extra_install_requires = ['cython>=0.29.30'] else: ext_modules = [] extra_install_requires = [] diff --git a/tox.ini b/tox.ini index 9aa4a968..5a7eb33c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,15 @@ [tox] # nopyx is a special env where Cython is NOT installed, and thus we run # pure-python tests -envlist = py27-test-nopyx,py27-{test,bench},py35-test,py36-test,py37-test,py38-test,py39-test,[y310-test,pypy-{test,bench},pypy3-{test},docs +envlist = py35-test,py36-test,py37-test,py38-test,py39-test,py310-test,py311-test,pypy-{test,bench},pypy3-{test},docs [testenv] setenv = TOX_ENV={envname} deps = - py27: pytest==4.6.11 - !py27: pytest==6.2.5 + pytest==6.2.5 #git+https://github.com/antocuni/pytest-benchmark.git#egg=pytest-benchmark - py27: pkgconfig==1.5.2 - py27: pycapnp==0.6.4 commands = test: py.test {envsitepackagesdir}/capnpy/testing -rs --pyx {posargs} @@ -20,11 +17,6 @@ commands = #bench: py.test {envsitepackagesdir}/capnpy/benchmarks -rs --benchmark-autosave {posargs} -[testenv:py27-test-nopyx] -setenv = - USE_CYTHON=0 - - [testenv:docs] setenv = USE_CYTHON=0 diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index e2897e29..6a914f65 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -13,7 +13,7 @@ PYTHONS=( for pydir in "${PYTHONS[@]}"; do pybin=/opt/python/$pydir/bin - "${pybin}/pip" install 'cython>=0.25' + "${pybin}/pip" install 'cython>=0.29.30' "${pybin}/pip" wheel /capnpy/ -w wheelhouse/ # workaround for this bug: