Remove python 2.7 CI testing

This also removes CUDA 8 testing.
glotzerlab · May 22, 2019 · 96ff9b7 · 96ff9b7
1 parent 6ae30fc
commit 96ff9b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -292,15 +292,3 @@ workflows:
           enable-tbb: on
           build-jit: on
           threads: "3"
-
-      - build_and_test:
-          name: gcc48-py27-cm28-mpi-tbb3
-          image: ubuntu16.04
-          cc: gcc-4.8
-          cxx: g++-4.8
-          cmake-bin: /opt/cmake-2.8.12/bin
-          python-version: "2.7"
-          enable-mpi: on
-          enable-tbb: on
-          build-jit: off
-          threads: "3"
diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline
             {
             parallel
                 {
-                stage('gcc54-py27-cuda8')
+                stage('gcc7-py36-cuda9')
                     {
                     agent { label 'gpu-short' }
 
@@ -33,18 +33,18 @@ pipeline
                             timeout(time: 1, unit: 'HOURS')
                                 {
                                 sh '''
-                                    singularity exec --nv /nfs/turbo/glotzer/containers/ci/ci-2019.05-cuda8.simg /usr/bin/cmake ../code -DPYTHON_EXECUTABLE=/usr/bin/python2.7 -DENABLE_CUDA=ON -DENABLE_MPI=OFF -DENABLE_TBB=OFF -DBUILD_VALIDATION=off -DBUILD_TESTING=on -DTEST_CPU_IN_GPU_BUILDS=OFF -DBUILD_DEPRECATED=off -DBUILD_JIT=OFF -DLLVM_DIR=/usr/lib/llvm-/cmake -DALWAYS_USE_MANAGED_MEMORY=OFF -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPULER=/usr/bin/g++ -GNinja
+                                    singularity exec --nv /nfs/turbo/glotzer/containers/ci/ci-2019.05-cuda9.simg /usr/bin/cmake ../code -DPYTHON_EXECUTABLE=/usr/bin/python3.6 -DENABLE_CUDA=ON -DENABLE_MPI=OFF -DENABLE_TBB=OFF -DBUILD_VALIDATION=off -DBUILD_TESTING=on -DTEST_CPU_IN_GPU_BUILDS=OFF -DBUILD_DEPRECATED=off -DBUILD_JIT=OFF -DLLVM_DIR=/usr/lib/llvm-/cmake -DALWAYS_USE_MANAGED_MEMORY=OFF -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPULER=/usr/bin/g++ -GNinja
                                    '''
 
-                                sh 'singularity exec --nv /nfs/turbo/glotzer/containers/ci/ci-2019.05-cuda8.simg ninja -j 3'
+                                sh 'singularity exec --nv /nfs/turbo/glotzer/containers/ci/ci-2019.05-cuda9.simg ninja -j 3'
                                 }
 
                             timeout(time: 1, unit: 'HOURS')
                                 {
                                 sh '''
                                     export OMP_NUM_THREADS=1
                                     export SINGULARITYENV_PREPEND_PATH=/usr/lib/llvm-/bin
-                                    singularity exec --nv /nfs/turbo/glotzer/containers/ci/ci-2019.05-cuda8.simg /usr/bin/ctest --no-compress-output -T test --output-on-failure
+                                    singularity exec --nv /nfs/turbo/glotzer/containers/ci/ci-2019.05-cuda9.simg /usr/bin/ctest --no-compress-output -T test --output-on-failure
                                    '''
                                 }
                             }

diff --git a/.jenkins/make_jenkinsfile.py b/.jenkins/make_jenkinsfile.py
@@ -7,17 +7,17 @@
 
 unit_tests = []
 vldt_tests = []
-unit_tests.append(dict(name='gcc54-py27-cuda8',
+unit_tests.append(dict(name='gcc7-py36-cuda9',
                   agent='gpu-short',
                   CC = '/usr/bin/gcc',
                   CXX = '/usr/bin/g++',
-                  PYVER = '2.7',
+                  PYVER = '3.6',
                   CMAKE_BIN = '/usr/bin',
                   ENABLE_CUDA = 'ON',
                   ENABLE_MPI = 'OFF',
                   ENABLE_TBB = 'OFF',
                   ALWAYS_USE_MANAGED_MEMORY = 'OFF',
-                  CONTAINER = ci_base + '-cuda8.simg',
+                  CONTAINER = ci_base + '-cuda9.simg',
                   BUILD_JIT = 'OFF',
                   LLVM_VERSION = '',
                   OMP_NUM_THREADS = '1'))