Merge branch 'master' into fci

Author: dschwoerer

.github/workflows/pythonpackage.yml

@@ -20,7 +20,7 @@ jobs:
     if: always()
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9, '3.10']
         pip-packages:
           - "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
       fail-fast: false
@@ -53,7 +53,7 @@ jobs:
     if: always()
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.8]
         pip-packages:
           - "setuptools pip pytest pytest-cov coverage codecov boutdata==0.1.4 xarray==0.18.0 dask==2.10.0 numpy==1.18.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==7.2.0" # test with oldest supported version of packages. Note, using numpy==1.18.0 as a workaround because numpy==1.17.0 is not supported on Python-3.7, even though we should currently support numpy==1.17.0.
       fail-fast: false

setup.cfg

@@ -5,7 +5,7 @@ author = Thomas Nicholas
 author_email = [email protected]
 description = Collect data from BOUT++ runs in python using xarray
 license = Apache
-python_requires = >=3.7
+python_requires = >=3.8
 long_description = file: README.md
 long_description_content_type = text/markdown
 classifiers =
@@ -16,9 +16,10 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Natural Language :: English
     Operating System :: POSIX :: Linux
-    Programming Language :: Python :: 3.6
-    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
     Topic :: Scientific/Engineering :: Visualization
 
 [options]
@@ -27,7 +28,7 @@ setup_requires =
     setuptools_scm[toml]>=3.4
     setuptools_scm_git_archive
 install_requires =
-    xarray>=0.18.0
+    xarray>=0.18.0,!=2022.9.0,!=2022.10.0
     boutdata>=0.1.4
     dask[array]>=2.10.0
     gelidum>=0.5.3