diff --git a/.travis.yml b/.travis.yml index c6d2e7d..9311000 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,7 @@ language: python python: - - 3.6 - - 3.5 - - 3.4 + - 3.9 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: pip install -U tox-travis @@ -25,4 +23,4 @@ deploy: on: tags: true repo: aldnav/geohash - python: 3.6 + python: 3.9 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 4f3c3f3..fa94cc5 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines: 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -3. The pull request should work for Python 3.4, 3.5 and 3.6, and for PyPy. Check +3. The pull request should work for Python 3.9, and for PyPy. Check https://travis-ci.org/aldnav/geohash/pull_requests and make sure that the tests pass for all supported Python versions. diff --git a/MANIFEST.in b/MANIFEST.in index 6330039..a6ccf91 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,7 +3,7 @@ include CONTRIBUTING.rst include HISTORY.rst include LICENSE include README.rst -include geohash/bin/**/*.* +recursive-include geohash/bin * recursive-include tests * recursive-exclude * __pycache__ diff --git a/geohash/bin/darwin/arm/geohash.so b/geohash/bin/darwin/arm/geohash.so index 6f84a15..22759d3 100755 Binary files a/geohash/bin/darwin/arm/geohash.so and b/geohash/bin/darwin/arm/geohash.so differ diff --git a/requirements_dev.txt b/requirements_dev.txt index 661cbb4..e1a4243 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,12 +1,12 @@ -bumpversion==0.5.3 -wheel==0.38.1 -watchdog==0.9.0 -flake8==3.5.0 -tox==3.5.2 -coverage==4.5.1 -Sphinx==1.8.1 -twine==1.12.1 +bump2version==1.0.1 +bumpversion==0.6.0 +watchdog==3.0.0 +flake8==6.0.0 +tox==4.4.11 +coverage==7.2.3 +Sphinx==6.1.3 +twine==4.0.2 -pytest==3.8.2 -pytest-runner==4.2 -cffi>=1.12.3 +pytest==7.3.0 +pytest-runner==6.0.0 +cffi==1.15.1 diff --git a/setup.cfg b/setup.cfg index faf3033..27c327c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,5 +21,5 @@ exclude = docs test = pytest [tool:pytest] -collect_ignore = ['setup.py'] +addopts = --ignore=setup.py diff --git a/setup.py b/setup.py index 9c5d265..42f4f59 100644 --- a/setup.py +++ b/setup.py @@ -25,10 +25,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'Natural Language :: English', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.9', ], description="Encode/decode Geohashes http://geohash.org", install_requires=requirements, diff --git a/tox.ini b/tox.ini index 80866ba..4727f08 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,9 @@ [tox] -envlist = py34, py35, py36, flake8 +envlist = py39, flake8 [travis] python = - 3.6: py36 - 3.5: py35 - 3.4: py34 + 3.9: py39 [testenv:flake8] basepython = python