Merge pull request #36 from CDAT/py38_libnetcdf

Py38 libnetcdf
CDAT · Apr 14, 2020 · d75a2dc · d75a2dc
2 parents b56602c + f1928ab
commit d75a2dc
Showing 1 changed file with 72 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ aliases:
  name: setup_miniconda
  command: |
  mkdir -p workspace
- git clone -b validateNightly git@github.com:CDAT/cdat workspace/cdat
+ git clone -b validateNightlyNew git@github.com:CDAT/cdat workspace/cdat
  # install_miniconda.py installs miniconda3 under $WORKDIR/miniconda
  python workspace/cdat/scripts/install_miniconda.py -w $WORKDIR -p 'py3'
 
@@ -71,7 +71,7 @@ aliases:
 jobs:
  macos_setup:
  macos:
- xcode: "11.3.0"
+ xcode: "11.4.0"
  environment:
  WORKDIR: /Users/distiller/project/macos_build
  PKG_NAME: "genutil"
@@ -103,16 +103,16 @@ jobs:
  paths:
  - linux_build
 
- macos_genutil_py2:
+ macos_genutil_py36:
  macos:
- xcode: "11.3.0"
+ xcode: "11.4.0"
  environment:
  WORKDIR: /Users/distiller/project/macos_build
  PKG_NAME: "genutil"
  REPO_NAME: "genutil"
  ENV_NAME: "test_genutil"
- CONDA_PY_VER: "python<3"
- BUILD_VARIANT_VER: "2.7"
+ CONDA_PY_VER: "python>=3.6,<3.7"
+ BUILD_VARIANT_VER: "3.6"
  steps:
  - checkout
  - attach_workspace:
@@ -130,7 +130,7 @@ jobs:
 
  macos_genutil_py37:
  macos:
- xcode: "11.3.0"
+ xcode: "11.4.0"
  environment:
  WORKDIR: /Users/distiller/project/macos_build
  PKG_NAME: "genutil"
@@ -153,16 +153,41 @@ jobs:
  paths:
  - macos_build/miniconda/conda-bld/osx-64/genutil*tar.bz2
 
- linux_genutil_py2:
+ macos_genutil_py38:
+ macos:
+ xcode: "11.4.0"
+ environment:
+ WORKDIR: /Users/distiller/project/macos_build
+ PKG_NAME: "genutil"
+ REPO_NAME: "genutil"
+ ENV_NAME: "test_genutil"
+ CONDA_PY_VER: "python>=3.8,<3.9"
+ BUILD_VARIANT_VER: "3.8"
+ steps:
+ - checkout
+ - attach_workspace:
+ at: .
+ - run: *conda_build
+ - run: *setup_run_tests
+ - run: *run_tests
+ - store_artifacts:
+ path: tests_html
+ destination: tests_html
+ - persist_to_workspace:
+ root: .
+ paths:
+ - macos_build/miniconda/conda-bld/osx-64/genutil*tar.bz2
+
+ linux_genutil_py36:
  machine:
  image: circleci/classic:latest
  environment:
  WORKDIR: /home/circleci/project/linux_build
  PKG_NAME: "genutil"
  REPO_NAME: "genutil"
  ENV_NAME: "test_genutil"
- CONDA_PY_VER: "python<3"
- BUILD_VARIANT_VER: "2.7"
+ CONDA_PY_VER: "python>=3.6,<3.7"
+ BUILD_VARIANT_VER: "3.6"
  steps:
  - checkout
  - attach_workspace:
@@ -206,6 +231,31 @@ jobs:
  paths:
  - linux_build/miniconda/conda-bld/linux-64/genutil*tar.bz2
 
+ linux_genutil_py38:
+ machine:
+ image: circleci/classic:latest
+ environment:
+ WORKDIR: /home/circleci/project/linux_build
+ PKG_NAME: "genutil"
+ REPO_NAME: "genutil"
+ ENV_NAME: "test_genutil"
+ CONDA_PY_VER: "python>=3.8,<3.9"
+ BUILD_VARIANT_VER: "3.8"
+ steps:
+ - checkout
+ - attach_workspace:
+ at: .
+ - run: *conda_build
+ - run: *setup_run_tests
+ - run: *run_tests
+ - store_artifacts:
+ path: tests_html
+ destination: tests_html
+ - persist_to_workspace:
+ root: .
+ paths:
+ - linux_build/miniconda/conda-bld/linux-64/genutil*tar.bz2
+
  upload:
  machine:
  image: circleci/classic:latest
@@ -227,21 +277,29 @@ workflows:
  jobs:
  - macos_setup
  - linux_setup
- - macos_genutil_py2:
+ - macos_genutil_py36:
  requires:
  - macos_setup
  - macos_genutil_py37:
  requires:
  - macos_setup
- - linux_genutil_py2:
+ - macos_genutil_py38:
+ requires:
+ - macos_setup
+ - linux_genutil_py36:
  requires:
  - linux_setup
  - linux_genutil_py37:
  requires:
  - linux_setup
+ - linux_genutil_py38:
+ requires:
+ - linux_setup
  - upload:
  requires:
- - macos_genutil_py2
+ - macos_genutil_py36
  - macos_genutil_py37
- - linux_genutil_py2
+ - macos_genutil_py38
+ - linux_genutil_py36
  - linux_genutil_py37
+ - linux_genutil_py38