diff --git a/.gitignore b/.gitignore index e69f8be..9ffd68c 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,7 @@ celerybeat-schedule # virtualenv .venv venv/ +.venv*/ ENV/ venv37/ venv38/ diff --git a/docs/conf.py b/docs/conf.py index 7d638bb..c93afc1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -27,7 +27,7 @@ # The short X.Y version version = "3.2" # The full version, including alpha/beta/rc tags -release = "3.2.3" +release = "3.2.4" # -- General configuration --------------------------------------------------- diff --git a/requirements.txt b/requirements.txt index e162ceb..642edbd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,2 @@ pytest -pythonnet~=3.0.1 -tox -pyyaml +tox \ No newline at end of file diff --git a/setup.py b/setup.py index 1d19145..026a8b0 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ def get_version(name): script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.join(script_dir, name) if not os.path.exists(os.path.join(script_dir, 'VERSION')): - version = '3.2.3' + version = '3.2.4' else: with open(os.path.join(script_dir, "VERSION"), "r") as version_file: version = version_file.read().rstrip() @@ -43,7 +43,11 @@ def read_contents(file_to_read): packages=find_packages("src"), package_dir={"": "src"}, include_package_data=True, - install_requires=["pythonnet~=3.0.1", "PyYAML"], + install_requires=[ + "pythonnet~=3.0.1; python_version < '3.10'", + "pythonnet~=3.1.0; python_version >= '3.10'", + "PyYAML" + ], tests_require=["pytest", "numpy"], classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/tox.ini b/tox.ini index 6725764..fa87c2e 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ # `tox -e py39,py311,flake8,docs` [tox] -envlist = py38, py39, py310, py311, py312, flake8 +envlist = py38, py39, py310, py311, py312, py313, py314, flake8 [testenv] commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs} @@ -23,8 +23,6 @@ setenv = PYTHONPATH = {toxinidir}/tests passenv = vsdev.json deps = pytest - pythonnet~=3.0.1 - pyyaml numpy [pytest]