add some newer versions to tox (#314)

* add some newer versions to tox"

* add warning about 3.12

* update jenkinsfile to add 3.10 and 3.11

Author: mattclarke

.pre-commit-config.yaml

@@ -1,40 +1,27 @@
-Contributing to Lewis
-=====================
-
+# Contributing to Lewis
 Contributions to Lewis are always welcome and there are different ways of
 contributing to the framework. We aim to respond to all communications within
 one working day.
 
 
-Reporting Issues
-----------------
-
+## Reporting Issues
 If you run into any issues or bugs while using Lewis or find the documentation
 of a feature unclear, you can help us improve Lewis by
-`opening an Issue <https://github.com/ess-dmsc/lewis/issues/new>`__
-here on GitHub. Please be sure to include enough information to reproduce the
+opening an issue here on GitHub. Please be sure to include enough information to reproduce the
 issue.
 
-If you've already created a fix, you can also directly
-`submit a Pull Request <#submitting-pull-requests>`__.
-
-
-Requesting Features
--------------------
+If you've already created a fix, you can also directly submit a pull request.
 
+## Requesting Features
 If a feature you want is missing from Lewis, feel free to
-`open an Issue <https://github.com/ess-dmsc/lewis/issues/new>`__
-here on GitHub to request it. Please describe the context and the expected
+open an issue here on GitHub to request it. Please describe the context and the expected
 behaviour in detail.
 
 If you've already implemented a new feature and would like to submit it, you
-can also directly `submit a Pull Request <#submitting-pull-requests>`__.
+can also directly submit a pull request.
 
-
-Submitting Pull Requests
-------------------------
-
-We are happy to accept contributed Pull Requests from forks. Please read through the
+## Submitting Pull Requests
+We are happy to accept contributed pull requests from forks. Please read through the
 developer guide to get started.
 
 If your Pull Request addresses any open Issues, please reference them with a
@@ -51,10 +38,7 @@ Please ensure your Pull Request passes all integration tests and is able to be
 merged with the main branch automatically.
 
 
-Submitting Devices
-------------------
-
+## Submitting Devices
 If you have a device you would like to contribute to the main repository, we
 are happy to accept these as a Pull Request as well. Please see the
 documentation for details on how to write a device simulator.
-

CONTRIBUTING.rst CONTRIBUTING.mdCONTRIBUTING.rst renamed to CONTRIBUTING.md

@@ -52,7 +52,7 @@ builders = pipeline_builder.createBuilders { container ->
    pipeline_builder.stage("${container.key}: Test") {
       def test_output = "TestResults.xml"
       container.sh """
-        pyenv local 3.7 3.8 3.9 
+        pyenv local 3.7 3.8 3.9 3.10 3.11
         cd ${project}
         python -m tox -- --junitxml=${test_output}
       """

Jenkinsfile

@@ -2,7 +2,10 @@
 Lewis - Let's write intricate simulators.
 
 Lewis is a Python framework for simulating hardware devices. It is
-compatible with Python 3.6 or higher.
+compatible with Python 3.7 to 3.11.
+
+It is currently not compatible with 3.12 as the asyncchat module has been removed from Python.
+We are going to fix this at some point.
 
 Lewis can be installed via pip or ran from source. See relevant usage sections of the docs for more details.
 

README.md

@@ -1,5 +1,4 @@
 -r requirements.txt
--r requirements-sphinx.txt
 approvaltests
 isort
 mock
@@ -13,6 +12,5 @@ tox-pyenv
 twine
 wheel
 
-# Pin to match versions in pre-commit hooks
 black==22.6.0
 flake8==3.8.4

requirements-dev.txt

@@ -1,4 +1,4 @@
-pyzmq==23.2.1
+pyzmq
 json-rpc
 semantic_version
 PyYAML

requirements-sphinx.txt

@@ -48,7 +48,7 @@ def readme():
     ],
     keywords="hardware simulation controls",
     packages=find_packages(exclude=["tests", "tests.*"]),
-    python_requires=">=3.6.0",
+    python_requires=">=3.7.0",
     install_requires=["pyzmq", "json-rpc", "semantic_version", "PyYAML", "scanf"],
     extras_require={
         "epics": ["pcaspy"],

requirements.txt

@@ -1,40 +1,27 @@
 [tox]
-envlist = py37, py38, py39, flake8, coverage, docs
+envlist = py37, py38, py39, py310, py311, flake8, coverage
 isolated_build = true
 skipsdist=true
 
 [testenv]
 description = Run unit tests, arguments are forwarded to pytest.
 deps =
     -r{toxinidir}/requirements-dev.txt
-    requests<2.30.0
 commands =
     python -m pytest tests system_tests/lewis_tests.py {posargs}
 
 [testenv:flake8]
 description = Run flake8.
 deps =
     -r{toxinidir}/requirements-dev.txt
-    requests<2.30.0
 commands =
     python -m flake8 setup.py lewis scripts system_tests tests
 
 [testenv:coverage]
 description = Run unit tests with Python and collect coverage data.
 basepython =
-    python3.7
+    python3.9
 deps =
     -r{toxinidir}/requirements-dev.txt
-    requests<2.30.0
 commands =
     python -m pytest --cov=lewis.core --cov=lewis.devices tests
-
-[testenv:docs]
-description = Build the documentation and treat warnings as errors.
-basepython =
-    python3.7
-deps =
-    -r{toxinidir}/requirements-dev.txt
-    requests<2.30.0
-commands =
-    sphinx-build -W -b html -d {envtmpdir}/doctrees docs/ docs/_build/html