Merge pull request #1035 from metno/drop-py39

drop Python 3.9 support
closes #1034

.github/workflows/CI.yml

@@ -9,7 +9,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     env:
-      PYTHON: 3.9
+      PYTHON: "3.10"
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ env.PYTHON }}
@@ -36,7 +36,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     env:
-      PYTHON: 3.9
+      PYTHON: "3.10"
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ env.PYTHON }}
@@ -63,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, '3.10', '3.11']
+        python-version: ['3.10', '3.11']
         experimental: [false]
         os: [ubuntu-22.04]
         include:
@@ -106,7 +106,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, '3.10', '3.11']
+        python-version: ['3.10', '3.11']
         experimental: [false]
     defaults:
       run:

.readthedocs.yaml

@@ -19,7 +19,7 @@ build:
     - proj-data
     - proj-bin
   tools:
-    python: "3.9"
+    python: "3.10"
 
 python:
   install:

pyaerocom/colocation_auto.py

@@ -5,20 +5,14 @@
 import glob
 import logging
 import os
-import sys
 import traceback
 from datetime import datetime
+from importlib import metadata
 from pathlib import Path
 from typing import Optional
 
-from cf_units import Unit
-
-if sys.version_info >= (3, 10):  # pragma: no cover
-    from importlib import metadata
-else:  # pragma: no cover
-    import importlib_metadata as metadata
-
 import pandas as pd
+from cf_units import Unit
 
 from pyaerocom import const
 from pyaerocom._lowlevel_helpers import BrowseDict, ListOfStrings, StrWithDefault, chk_make_subdir

pyaerocom/io/readungridded.py

@@ -1,16 +1,11 @@
 import logging
 import os
-import sys
 import warnings
 from copy import deepcopy
+from importlib import metadata
 from pathlib import Path
 from typing import Optional, Union
 
-if sys.version_info >= (3, 10):  # pragma: no cover
-    from importlib import metadata
-else:  # pragma: no cover
-    import importlib_metadata as metadata
-
 from pyaerocom import const
 from pyaerocom.combine_vardata_ungridded import combine_vardata_ungridded
 from pyaerocom.exceptions import DataRetrievalError, NetworkNotImplemented, NetworkNotSupported

pyaerocom_env.yml

@@ -19,8 +19,6 @@ dependencies:
   - openpyxl
   - typer >=0.7.0
   - pydantic
-## python < 3.10
-  - importlib-metadata >=3.6
 ## python < 3.11
   - tomli >=2.0.1
   - importlib-resources >=5.10

pyproject.toml

@@ -9,7 +9,6 @@ authors = [{ name = "MET Norway" }]
 description = "pyaerocom model evaluation software"
 classifiers = [
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
@@ -19,7 +18,7 @@ classifiers = [
     "Intended Audience :: Education",
     "Topic :: Scientific/Engineering :: Atmospheric Science",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "scitools-iris>=3.6.0, <3.8",
     "xarray<=2022.10.0",
@@ -40,13 +39,11 @@ dependencies = [
     "openpyxl",
     "geojsoncontour",
     "typer>=0.7.0",
-    # python < 3.10
-    'importlib-metadata>=3.6; python_version < "3.10"',
     # python < 3.11
     'tomli>=2.0.1; python_version < "3.11"',
     'importlib-resources>=5.10; python_version < "3.11"',
     # https://github.com/SciTools/cf-units/issues/218
-    'cf-units>=3.1; python_version >= "3.10"',
+    'cf-units>=3.1',
     "pyaro",
     "pydantic",
 
@@ -150,19 +147,19 @@ exclude_lines = [
 ]
 
 [tool.black]
-target-version = ['py39']
+target-version = ['py310']
 extend-exclude = "pyaerocom-tutorials"
 line-length = 99
 
 [tool.isort]
-py_version = "39"
+py_version = "310"
 profile = "black"
 src_paths = ["pyaerocom", "tests"]
 extend_skip = ["pyaerocom-tutorials"]
 line_length = 99
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.10"
 warn_unused_configs = true
 warn_unused_ignores = true
 warn_no_return = true
@@ -202,7 +199,7 @@ max-line-length = 99
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py39, py310, py311, py312, format, lint, docs
+envlist = py310, py311, py312, format, lint, docs
 skip_missing_interpreters = True
 isolated_build = True
 requires =

tests/plugins/test_entry_points.py

@@ -1,9 +1,4 @@
-import sys
-
-if sys.version_info >= (3, 10):  # pragma: no cover
-    from importlib import metadata
-else:  # pragma: no cover
-    import importlib_metadata as metadata
+from importlib import metadata
 
 
 def test_gridded():