diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index f723aac6..9d358f39 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -19,10 +19,10 @@ concurrency: jobs: unit-test: name: Run unit tests - runs-on: ubuntu-22.04 # 3.7 needs 22.04, can move to -latest when we drop 3.7 support + runs-on: ubuntu-latest strategy: matrix: - python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python: ["3.10", "3.11", "3.12", "3.13"] steps: - name: Set up Python ${{ matrix.python }} diff --git a/README.rst b/README.rst index 51a30f54..77e9a856 100644 --- a/README.rst +++ b/README.rst @@ -33,7 +33,7 @@ historical look back of the housekeeping data. Dependencies ------------ -This code targets Python 3.7+. +This code targets Python 3.10+. * `so3g`_ - Required for using the HK Aggregator Agent. * `crossbar`_ (optional) - The supported WAMP router. Controllable via diff --git a/docs/developer/writing-plugins.rst b/docs/developer/writing-plugins.rst index 3d0207ff..207c5b99 100644 --- a/docs/developer/writing-plugins.rst +++ b/docs/developer/writing-plugins.rst @@ -115,10 +115,8 @@ running: .. code-block:: python import sys - if sys.version_info < (3, 10): - from importlib_metadata import entry_points - else: - from importlib.metadata import entry_points + + from importlib.metadata import entry_points discovered_plugins = entry_points(group='ocs.plugins') print(discovered_plugins) diff --git a/ocs/agent_cli.py b/ocs/agent_cli.py index bcad8a97..fc7383a4 100755 --- a/ocs/agent_cli.py +++ b/ocs/agent_cli.py @@ -5,10 +5,7 @@ import sys import warnings -if sys.version_info < (3, 10): - from importlib_metadata import entry_points -else: - from importlib.metadata import entry_points +from importlib.metadata import entry_points from ocs import site_config diff --git a/pyproject.toml b/pyproject.toml index 797ae9a9..2a18d435 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,24 +10,21 @@ name = "ocs" dynamic = ["version"] description = "Observatory Control System" readme = "README.rst" -requires-python = ">=3.7" +requires-python = ">=3.10" classifiers = [ "Framework :: Twisted", "Intended Audience :: Science/Research", "License :: OSI Approved :: BSD License", "Programming Language :: Python :: 3", - "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 :: 3.13", "Topic :: Scientific/Engineering :: Astronomy", ] dependencies = [ "autobahn", "deprecation", - "importlib_metadata;python_version<\"3.10\"", "influxdb", "influxdb-client[ciso]", "numpy",