Merge branch 'main' into issue149

NCAR · Sep 29, 2023 · 8487413 · 8487413
2 parents 7626c24 + c138630
commit 8487413
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-latest", "macos-latest"]
-        python-version: [ "3.8", "3.9", "3.10" ]
+        python-version: [ "3.9", "3.10", "3.11" ]
     steps:
       - name: Cancel previous runs
         uses: styfle/[email protected]

diff --git a/build_envs/docs.yml b/build_envs/docs.yml
@@ -2,10 +2,10 @@ name: gv-docs
 channels:
   - conda-forge
 dependencies:
-  - python>=3.8, <=3.10
+  - python>=3.8, <3.11
   - cartopy
   - cmaps
-  - matplotlib
+  - matplotlib<3.8
   - pint
   - pip
   - pre-commit

diff --git a/build_envs/environment.yml b/build_envs/environment.yml
@@ -2,10 +2,10 @@ name: geocat_viz_build
 channels:
   - conda-forge
 dependencies:
-  - python>=3.8, <=3.10
+  - python>=3.8, <3.11
   - cartopy
   - make
-  - matplotlib
+  - matplotlib<3.8
   - sphinx
   - pip
   - cmaps

diff --git a/build_envs/upstream-dev-environment.yml b/build_envs/upstream-dev-environment.yml
@@ -2,7 +2,7 @@ name: geocat_viz_upstream
 channels:
   - conda-forge
 dependencies:
-  - python>=3.7
+  - python>=3.9
   - geocat-comp
   - cf_xarray>=0.3.1
   - geocat-datafiles

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -7,11 +7,13 @@ Release Notes
 
 New Features
 ^^^^^^^^^
-* Add code of conduct by `Katelyn Fitzgerald`_ in (:pr:`163`)
+* Add code of conduct by `Katelyn FitzGerald`_ in (:pr:`163`)
+* Added Python 3.11 and removed Python 3.8 `Katelyn FitzGerald`_ in (:pr:`162`)
 
 Bug Fixes
 ^^^^^^^^^
-* Xarray unpinned by `Katelyn Fitzgerald`_ in (:pr:`159`)
+* Matplotlib pinned to <3.8 `Katelyn Fitzgerald`_ in (:pr:`161`)
+* Xarray unpinned by `Katelyn FitzGerald`_ in (:pr:`159`)
 
 v2023.09.0 (September 7, 2023)
 ------------------------------

diff --git a/setup.cfg b/setup.cfg
@@ -17,15 +17,15 @@ classifiers =
     Intended Audience :: Science/Research
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Topic :: Scientific/Engineering
 
 [options]
 zip_safe = False
 include_package_data = True
-python_requires = >=3.8, <3.11
+python_requires = >=3.9, <3.12
 package_dir =
     =src
 packages =
@@ -36,7 +36,7 @@ setup_requires =
     setuptools
     pip
 install_requires =
-    matplotlib
+    matplotlib<3.8
     xarray
     numpy
     cartopy