Merge pull request #155 from ajdawson/develop-2.0

Changes to prepare for a v2 release

.github/workflows/deploy-docs.yml

@@ -26,7 +26,7 @@ jobs:
         environment-name: TEST
         init-shell: bash
         create-args: >-
-          python=3 pip iris xarray cdms2 genutil cdutil sphinx sphinx-issues --channel conda-forge
+          python=3 pip iris xarray sphinx sphinx-issues --channel conda-forge
 
     - name: Install eofs
       shell: bash -l {0}

.github/workflows/tests-standard.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [windows-latest, ubuntu-latest, macos-latest]
       fail-fast: false
 

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macos-latest]
       fail-fast: false
 
@@ -23,7 +23,7 @@ jobs:
         environment-name: TEST
         init-shell: bash
         create-args: >-
-          python=${{ matrix.python-version }} pip pytest iris xarray cdms2 genutil cdutil --channel conda-forge
+          python=${{ matrix.python-version }} pip pytest iris xarray --channel conda-forge
 
     - name: Install eofs
       shell: bash -l {0}

README.md

@@ -1,7 +1,7 @@
 eofs - EOF analysis in Python
 =============================
 
-[![Build Status](https://travis-ci.org/ajdawson/eofs.svg?branch=master)](https://travis-ci.org/ajdawson/eofs) [![DOI (paper)](https://img.shields.io/badge/DOI%20%28paper%29-10.5334%2Fjors.122-blue.svg)](http://doi.org/10.5334/jors.122) [![DOI (latest release)](https://zenodo.org/badge/20448/ajdawson/eofs.svg)](https://zenodo.org/badge/latestdoi/20448/ajdawson/eofs)
+[![DOI (paper)](https://img.shields.io/badge/DOI%20%28paper%29-10.5334%2Fjors.122-blue.svg)](http://doi.org/10.5334/jors.122) [![DOI (latest release)](https://zenodo.org/badge/20448/ajdawson/eofs.svg)](https://zenodo.org/badge/latestdoi/20448/ajdawson/eofs)
 
 
 Overview
@@ -14,15 +14,15 @@ Some of the key features are listed below:
 
 * Suitable for large data sets: computationally efficient for the large data sets typical of modern climate model output.
 * Transparent handling of missing values: missing values are removed automatically when computing EOFs and re-inserted into output fields.
-* Meta-data preserving interfaces (optional): works with the iris data analysis package, xarray, or the cdms2 module (from UV-CDAT) to carry meta-data over from input fields to output.
+* Meta-data preserving interfaces (optional): works with the iris data analysis package or xarray to carry meta-data over from input fields to output.
 * No Fortran dependencies: written in Python using the power of NumPy, no compilers required.
 
 
 Requirements
 ------------
 
 eofs only requires the NumPy package (and setuptools to install).
-In order to use the meta-data preserving interfaces one (or more) of cdms2 (part of [UV-CDAT](http://uvcdat.llnl.gov/)), [iris](http://scitools.org.uk/iris), or [xarray](http://xarray.pydata.org) is needed.
+In order to use the meta-data preserving interfaces one (or both) of [iris](http://scitools.org.uk/iris) or [xarray](http://xarray.pydata.org) is needed.
 
 
 Documentation
@@ -42,7 +42,7 @@ You can additionally cite the [Zenodo DOI](http://dx.doi.org/10.5281/zenodo.4687
 Installation
 ------------
 
-eofs works on Python 2 or 3 on Linux, Windows or OSX.
+eofs works on Python 3 on Linux, Windows or MacOS.
 The easiest way to install eofs is by using [conda](http://conda.pydata.org/docs/) or pip:
 
     conda install -c conda-forge eofs
@@ -59,6 +59,6 @@ You can also install from the source distribution:
 Frequently asked questions
 --------------------------
 
-* **Do I need UV-CDAT/cdms2, iris or xarray to use eofs?**
+* **Do I need iris or xarray to use eofs?**
   No. All the computation code uses NumPy only.
-  The cdms2 module, iris and xarray are only required for the meta-data preserving interfaces.
+  The iris and xarray modules are only required for the meta-data preserving interfaces.

doc/api/eofs.tools.rst

@@ -16,16 +16,15 @@
    :members:
 
 
-`eofs.tools.cdms`
+`eofs.tools.iris`
 -----------------
 
-.. automodule:: eofs.tools.cdms
+.. automodule:: eofs.tools.iris
    :members:
 
 
-`eofs.tools.iris`
------------------
+`eofs.tools.xarray`
+-------------------
 
-.. automodule:: eofs.tools.iris
+.. automodule:: eofs.tools.xarray
    :members:
-

doc/api/index.rst

@@ -11,11 +11,9 @@ Available EOF solvers
    :nosignatures:
 
    eofs.standard.Eof
-   eofs.cdms.Eof
    eofs.iris.Eof
    eofs.xarray.Eof
    eofs.multivariate.standard.MultivariateEof
-   eofs.multivariate.cdms.MultivariateEof
    eofs.multivariate.iris.MultivariateEof
 
 
@@ -26,10 +24,8 @@ Full documentation
    :maxdepth: 1
 
    eofs.standard
-   eofs.cdms
    eofs.iris
    eofs.xarray
    eofs.tools
    eofs.multivariate.standard
-   eofs.multivariate.cdms
    eofs.multivariate.iris