Merge branch 'maintenance-1.5.x'

Author: Try2Code

.circleci/config.yml

@@ -3,61 +3,41 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/python:3.8.0a4-stretch
+      - image: circleci/python:3.9
     steps:
       - run:
           name: Install dependencies (debian)
           command: |
             sudo apt-get update
-            sudo apt-get install gcc gfortran make binutils binutils-dev libc6-dev libbsd-dev
+            sudo apt-get install gcc gfortran make binutils binutils-dev libc6-dev libbsd-dev 
             sudo apt-get install libnetcdf-dev libhdf5-dev
-            sudo apt-get install ruby rake
-            sudo apt-get install python-dev libpython-dev
-            sudo apt-get install python-netcdf4
-            sudo apt-get install python-unittest2
+            sudo apt-get install colorize
+            sudo apt-get install cdo
+            sudo apt-get install rake ruby-dev
       - run:
-          name: Checkout cdo-bindings
-          command: |
-            git clone https://github.com/Try2Code/cdo-bindings.git
-      - run:
-          name: Install conda, CDO and environements for Python 2.7/3.7
-          command: |
-            wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && bash miniconda.sh -b -p $HOME/miniconda
-            export PATH="$HOME/miniconda/bin:$PATH"
-            hash -r
-            conda config --set always_yes yes --set changeps1 no
-            conda config --add channels conda-forge
-            conda update -q --all
-            conda info -a
-            cd cdo-bindings
-            conda env create --file .circleci/py2.7.yml
-            conda env create --file .circleci/py3.7.yml
-      - run:
-          name: Install dependencies (rake)
+          name: Install dependencies (testing)
           command: |
+            pip install xarray netcdf4 six numpy unittest2
             gem install parallel --version '<= 1.12' --user -N
             gem install minitest colorize facets --user -N
       - run:
-          name: Run Tests Python 2.7
+          name: Checkout cdo-bindings
+          command: |
+            git clone -b ${CIRCLE_BRANCH} https://github.com/Try2Code/cdo-bindings.git
+      - run:
+          name: Run Tests Python 3.9
           command: |
-            export PATH="$HOME/miniconda/bin:$PATH"
-            source activate test_env_py27
             cdo -V
             type -p cdo
-            python --version
+            python3 --version
             cd cdo-bindings
-            rake testPython CDO=$(type -p cdo) NO_COLOR=1
-            conda remove -y netCDF4 xarray
-            rake testPython CDO=$(type -p cdo) NO_COLOR=1
+            rake testPython3 CDO=$(type -p cdo) NO_COLOR=1
       - run:
-          name: Run Tests Python 3.7
+          name: Run Tests Python 3.9 - no netCDF4/Xarray
           command: |
-            export PATH="$HOME/miniconda/bin:$PATH"
-            source activate test_env_py37
             cdo -V
             type -p cdo
-            python --version
+            python3 --version
             cd cdo-bindings
-            rake testPython CDO=$(type -p cdo) NO_COLOR=1
-            conda remove -y netCDF4 xarray
-            rake testPython CDO=$(type -p cdo) NO_COLOR=1
+            pip uninstall -y xarray netcdf4
+            rake testPython3 CDO=$(type -p cdo) NO_COLOR=1

.circleci/py2.7.yml

@@ -0,0 +1,28 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['3.1', '3.0', '2.7']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: apt-get install cdo libnetcdf-dev
+        run: gem install narray narray-miss ruby-netcdf
+      - name: Run tests
+        run: rake testRuby

.circleci/py3.7.yml

@@ -1,6 +1,6 @@
 # Cdo.{rb,py} - Use Ruby/Python to access the power of CDO
 
-[![Python Tests](https://circleci.com/gh/Try2Code/cdo-bindings/tree/master.svg?style=shield)](https://circleci.com/gh/Try2Code/cdo-bindings)
+[![Tests](https://circleci.com/gh/Try2Code/cdo-bindings/tree/master.svg?style=shield)](https://circleci.com/gh/Try2Code/cdo-bindings)
 
 Welcome to the scripting interfaces of [CDO](https://code.mpimet.mpg.de/projects/cdo/wiki)!
 This repository contains interfaces for [Ruby](http://www.ruby-lang.org) and [Python](https://www.python.org). If you are not sure, wether this is useful or not, please have a look at:
@@ -32,6 +32,9 @@ Releases are distributed via [pypi](https://pypi.org/project/cdo) and [rubygems]
 
 Cdo.{rb,py} requires a working CDO binary and Ruby 2.x or Python 2.7/3.x
 
+**PLEASE NOTE: python-2.7 is unmaintained since January 2021**
+Many dependencies dropped support for 2.7 so I do manual testing with it,only.
+
 Multi-dimensional arrays (numpy for python, narray for ruby) require addtional
 netcdf-io modules. These are [scipy](https://docs.scipy.org/doc/scipy/reference/io.html) or [python-netcdf4](https://pypi.python.org/pypi/netCDF4) for python and
 [ruby-netcdf](https://rubygems.org/gems/ruby-netcdf) for ruby. Because scipy has some difficulties with netcdf, I dropped the support of it with release 1.5.0.
@@ -204,6 +207,11 @@ http://code.mpimet.mpg.de/projects/cdo
     - many of them just set return type, so they will go to the _run()_ method
     - options only has effect during run of the tool, so this can also go into _run()_
     - the different input types can be handled in something like _input()_ or
+* **1.5.6**:
+  - slight adoptions for CDO-2.0.0
+  - limitted support for python-2.7: many other libs dropped support for it so I can only do limitted testing
+  - new API: `cdo.config` holds a dictionary/hash with built-in CDO features (availble sind CDO-1.9.x), empty otherwise
+  - removed cdo.hasLib() and cdo.libsVersion(): relied on unstable output of `cdo -V`. use cdo.config instead
       _infiles()_. This should clean up the lengthy code, which does this
       currently
 * **1.5.4(python-only)**:

.github/workflows

@@ -8,6 +8,8 @@ CLEAN.include("**/*.log")
 CLEAN.include("**/*.log.[0-9]*")
 CLEAN.include("{ruby,python}/*.{grb,nc,png,svg}")
 CLEAN.include("python/tempPy*")
+CLEAN.include("ruby/tempRb*")
+CLEAN.include("/tmp/Cdorb*")
 CLEAN.include("python/test/tempPy*")
 CLEAN.include("python/__pycache__")
 CLEAN.include("python/test/__pycache__")
@@ -24,28 +26,37 @@ String.disable_colorization = (ENV.has_key?('NO_COLOR'))
 # following test should not be run in parallel with other tests
 SERIAL_TESTS = %w[test_system_tempdir]
 
+spackEnvCommand = lambda {|modhash|
+  lambda {|command| [". #{SpackEnv}" ,
+                     "spack load /#{modhash}",
+                     command,
+                     "spack unload /#{modhash}"].join(';')
+  }
+}
 
 def getCdoPackagesFromSpack
   # list possible cdo modules provided by spack
-  cmd = [". #{SpackEnv}" , 'spack module tcl loads cdo | grep module'].join(';')
-  modules = IO.popen(cmd).readlines.map(&:chomp)
+  info = IO.popen([". #{SpackEnv}" ,
+                   'spack find -lp cdo | grep cdo'].join(';')).readlines.map(&:chomp).map(&:split).transpose
+
+  return {
+    hash:    info[0],
+    version: info[1],
+    path:    info[2],
+  }
 end
 
 desc "run each CDO binary from the regression tests"
 task :checkRegression do |t|
-  getCdoPackagesFromSpack.each {|spackModule|
-    cmd = [". #{SpackEnv}" ,
-           "module purge",
-           spackModule,
-           "cdo -V",
-           "module purge"].join(';')
-
-    sh cmd
+  info = getCdoPackagesFromSpack
+  info[:hash].each_with_index {|spackHash,i|
+    puts info[:version][i].colorize(:green)
+    sh spackEnvCommand[spackHash]["cdo -V"]
   }
 end
 desc "list spack modules available for regression testing"
 task :listRegressionModules do |t|
-  getCdoPackagesFromSpack.each {|mod| puts mod}
+  pp getCdoPackagesFromSpack[:version]
 end
 
 def pythonTest(name: nil,interpreter: PythonInterpreter)
@@ -89,7 +100,7 @@ end
 
   desc "test for correct tempfile deletion (#{lang})"
   task "test#{lang}_tempfiles".to_sym do |t|
-    # make sure no other testing process has already created cdo-tempfile 
+    # make sure no other testing process has already created cdo-tempfile
     unless Dir.glob("/tmp/Cdo*").empty? then
       warn "Cannot run temp file test - target dir /tmp is no empty"
       exit(1)
@@ -106,13 +117,10 @@ end
   desc "run regresssion for multiple CDO releases in #{lang}"
   task "test#{lang}Regression".to_sym, :name do |t,args|
     runTests = args.name.nil? ? "rake test#{lang}" : "rake test#{lang}[#{args.name}]"
-    getCdoPackagesFromSpack.each {|spackModule|
-      cmd = [". #{SpackEnv}" ,
-             "module purge",
-             spackModule,
-             runTests,
-             "module purge"].join(';')
-      puts spackModule.split.last.colorize(:green)
+    spackInfo = getCdoPackagesFromSpack
+    spackInfo[:hash].each_with_index {|spackModule,i|
+      cmd = spackEnvCommand[spackModule][runTests]
+      puts "#{spackInfo[:version][i]}(#{spackModule.colorize(:green)})"
       sh cmd
     }
   end
@@ -123,18 +131,14 @@ end
         ? "rake test#{lang}#{pythonRelease}" \
         : "rake test#{lang}#{pythonRelease}[#{args.name}]"
       getCdoPackagesFromSpack.each {|spackModule|
-        cmd = [". #{SpackEnv}" ,
-               "module purge",
-               spackModule,
-               runTests,
-               "module purge"].join(';')
+        cmd = spackEnvCommand[spackModule][runTests]
         puts spackModule.split.last.colorize(:green)
         sh cmd
       }
     end
     desc "test for correct tempfile deletion (#{lang}#{pythonRelease})"
     task "test#{lang}#{pythonRelease}_tempfiles".to_sym do |t|
-      # make sure no other testing process has already created cdo-tempfile 
+      # make sure no other testing process has already created cdo-tempfile
       unless Dir.glob("/tmp/Cdo*").empty? then
         warn "Cannot run temp file test - target dir /tmp is no empty"
         exit(1)