diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 946ae51..c2f9473 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.9, 3.10.x, 3.11, 3.12] steps: - uses: actions/checkout@v1 diff --git a/docs/requirements.txt b/docs/requirements.txt index 9364148..8213302 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==4.4.0 -sphinx_rtd_theme==1.0.0 +sphinx +sphinx_rtd_theme diff --git a/setup.cfg b/setup.cfg index b88034e..08aedd7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,2 @@ [metadata] -description-file = README.md +description_file = README.md diff --git a/setup.py b/setup.py index b7b7e63..66880fd 100644 --- a/setup.py +++ b/setup.py @@ -28,10 +28,10 @@ "Natural Language :: English", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", - "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", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Scientific/Engineering :: GIS", @@ -39,5 +39,4 @@ ], packages=["openlr"], install_requires=[], - test_suite="tests", ) diff --git a/tox.ini b/tox.ini index 87d2e80..3f608ca 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ - [tox] -envlist = py{36,37,38,39}, black, coverage, docs +envlist = py{39,310,311,312}, black, coverage, docs [testenv] -commands = python setup.py test +deps = pytest +commands = pytest tests [testenv:black] deps = black @@ -28,7 +28,7 @@ commands = sphinx-build -q -W -b html "." "_build" [gh-actions] python = - 3.6: py36 - 3.7: py37 - 3.8: py38 - 3.9: py39, docs, coverage, black + 3.9: py39 + 3.10: py310 + 3.11: py311 + 3.12: py312, docs, coverage, black