Enable NetCDF Time Annotation Plugin in CI

This adds the cftime Python module dependency on Linux and Windows machines with Python.
Kitware · Jun 24, 2022 · 0bfb8ea · 0bfb8ea
1 parent f28abb8
commit 0bfb8ea
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/.gitlab/ci/configure_fedora35.cmake b/.gitlab/ci/configure_fedora35.cmake
@@ -1 +1,5 @@
+
+# Enable default-off plugin with Python dependency
+set(PARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin ON CACHE BOOL "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora_common.cmake")
diff --git a/.gitlab/ci/configure_windows_vs2019_kits_mpi_python_qt.cmake b/.gitlab/ci/configure_windows_vs2019_kits_mpi_python_qt.cmake
@@ -1 +1,4 @@
+# Enable default-off plugin with Python dependency
+set(PARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin ON CACHE BOOL "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs2019.cmake")
diff --git a/.gitlab/ci/docker/fedora35/install_deps.sh b/.gitlab/ci/docker/fedora35/install_deps.sh
@@ -47,7 +47,7 @@ dnf install -y --setopt=install_weak_deps=False \
     python3-pandas python3-pandas-datareader python3-sphinx python3-pip \
     python3-mpi4py-mpich python3-mpi4py-openmpi python3-matplotlib
 
-python3 -m pip install wslink
+python3 -m pip install wslink cftime
 
 # Plugin dependencies
 dnf install -y --setopt=install_weak_deps=False \

diff --git a/.gitlab/ci/requirements-phase1.txt b/.gitlab/ci/requirements-phase1.txt
diff --git a/.gitlab/ci/requirements-phase2.txt → .gitlab/ci/requirements.txt b/.gitlab/ci/requirements-phase2.txt → .gitlab/ci/requirements.txt
@@ -2,8 +2,7 @@
 # we are actually testing at any given point.
 
 # NetCDFTimeAnnotationPlugin
-# Needs Cython installed before it can be `pip install`'d
-netcdftime==1.0.0a2
+cftime==1.6.0
 
 # numpy
 # Note that Linux will need 1.19.4

diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
@@ -22,7 +22,7 @@
 
 .fedora35:
     extends: .linux
-    image: "kitware/paraview:ci-fedora35-20220420"
+    image: "kitware/paraview:ci-fedora35-20220620"
 
 .el8_icc:
     extends: .linux

diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
@@ -99,8 +99,7 @@
         # This may be necessary when running manually.
         # Set-ExecutionPolicy -Scope CurrentUser RemoteSigned
         - . .\build\ci-venv\Scripts\Activate.ps1
-        - pip install -qq -r $pwdpath\.gitlab\ci\requirements-phase1.txt
-        - pip install -qq -r $pwdpath\.gitlab\ci\requirements-phase2.txt
+        - pip install -qq -r $pwdpath\.gitlab\ci\requirements.txt
         - Set-Item -Force -Path "env:PATH" -Value "$env:PATH;$env:SCCACHE_PATH"
         - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1
         - sccache --start-server