From aae79dab859c9273b25061369509cbc7b5d0b6f2 Mon Sep 17 00:00:00 2001 From: adisingh Date: Fri, 31 Jul 2026 15:50:20 +0530 Subject: [PATCH 1/7] doc fix: updated upper limit of python version --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 835792a..1aecd15 100644 --- a/README.rst +++ b/README.rst @@ -13,7 +13,7 @@ Requirements **niveristand** requires the following to be installed: * VeriStand 2021 or later -* CPython 3.8 or later (the standard Python, available on python.org and elsewhere) +* CPython 3.8 to 3.13 (the standard Python, available on python.org and elsewhere) .. _installation_section: From e6b0f8688834c83c50c1f9378cb4877ad6b9ad6e Mon Sep 17 00:00:00 2001 From: adisingh Date: Fri, 31 Jul 2026 16:47:02 +0530 Subject: [PATCH 2/7] doc fix: added comparision symbols --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1aecd15..864aa4e 100644 --- a/README.rst +++ b/README.rst @@ -13,7 +13,7 @@ Requirements **niveristand** requires the following to be installed: * VeriStand 2021 or later -* CPython 3.8 to 3.13 (the standard Python, available on python.org and elsewhere) +* CPython >=3.8, <=3.13 (the standard Python, available on python.org and elsewhere) .. _installation_section: From 3293096e10669c412c5045dd07c8100bead9e594 Mon Sep 17 00:00:00 2001 From: adisingh Date: Wed, 5 Aug 2026 04:52:08 +0530 Subject: [PATCH 3/7] fix: selecting pythonnet based on python version --- .gitignore | 1 + README.rst | 2 +- docs/conf.py | 2 +- requirements.txt | 3 ++- setup.py | 8 ++++++-- tox.ini | 5 +++-- 6 files changed, 14 insertions(+), 7 deletions(-) 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/README.rst b/README.rst index 864aa4e..9d3456d 100644 --- a/README.rst +++ b/README.rst @@ -13,7 +13,7 @@ Requirements **niveristand** requires the following to be installed: * VeriStand 2021 or later -* CPython >=3.8, <=3.13 (the standard Python, available on python.org and elsewhere) +* CPython >=3.8, <=3.14 (the standard Python, available on python.org and elsewhere) .. _installation_section: diff --git a/docs/conf.py b/docs/conf.py index 7d638bb..e2277b9 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.dev1" # -- General configuration --------------------------------------------------- diff --git a/requirements.txt b/requirements.txt index e162ceb..557966a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ pytest -pythonnet~=3.0.1 +pythonnet~=3.0.1; python_version < "3.10" +pythonnet~=3.1.0; python_version >= "3.10" tox pyyaml diff --git a/setup.py b/setup.py index 1d19145..d4a8da2 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.dev1' 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..a7a2213 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,7 +23,8 @@ setenv = PYTHONPATH = {toxinidir}/tests passenv = vsdev.json deps = pytest - pythonnet~=3.0.1 + pythonnet~=3.0.1; python_version < '3.10' + pythonnet~=3.1.0; python_version >= '3.10' pyyaml numpy From 71f27560ca53704f6661ff08d8da7e4e0b54cdb3 Mon Sep 17 00:00:00 2001 From: adisingh Date: Wed, 5 Aug 2026 12:26:07 +0530 Subject: [PATCH 4/7] fix: release version corrected --- docs/conf.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e2277b9..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.4.dev1" +release = "3.2.4" # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index d4a8da2..104ee41 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.4.dev1' + version = '3.2.4' else: with open(os.path.join(script_dir, "VERSION"), "r") as version_file: version = version_file.read().rstrip() From 79684678f910d1012c0090a8ca51af33a67603eb Mon Sep 17 00:00:00 2001 From: adisingh Date: Wed, 5 Aug 2026 14:18:04 +0530 Subject: [PATCH 5/7] refactor: indent fix --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 104ee41..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.4' + version = '3.2.4' else: with open(os.path.join(script_dir, "VERSION"), "r") as version_file: version = version_file.read().rstrip() From 90c3be9e5493cf700a25f53252511b0784bb6e09 Mon Sep 17 00:00:00 2001 From: adisingh Date: Wed, 5 Aug 2026 14:44:34 +0530 Subject: [PATCH 6/7] doc fix: reverted upper bound change in readme --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 9d3456d..835792a 100644 --- a/README.rst +++ b/README.rst @@ -13,7 +13,7 @@ Requirements **niveristand** requires the following to be installed: * VeriStand 2021 or later -* CPython >=3.8, <=3.14 (the standard Python, available on python.org and elsewhere) +* CPython 3.8 or later (the standard Python, available on python.org and elsewhere) .. _installation_section: From 444c876121ff2654e9acc65a5ce48d55ca625bb9 Mon Sep 17 00:00:00 2001 From: adisingh Date: Fri, 7 Aug 2026 15:29:54 +0530 Subject: [PATCH 7/7] fix: no need to update pythonnet 3 places --- requirements.txt | 5 +---- tox.ini | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 557966a..642edbd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,2 @@ pytest -pythonnet~=3.0.1; python_version < "3.10" -pythonnet~=3.1.0; python_version >= "3.10" -tox -pyyaml +tox \ No newline at end of file diff --git a/tox.ini b/tox.ini index a7a2213..fa87c2e 100644 --- a/tox.ini +++ b/tox.ini @@ -23,9 +23,6 @@ setenv = PYTHONPATH = {toxinidir}/tests passenv = vsdev.json deps = pytest - pythonnet~=3.0.1; python_version < '3.10' - pythonnet~=3.1.0; python_version >= '3.10' - pyyaml numpy [pytest]