Merge pull request #117 from EUDAT-B2HANDLE/devel

Remove python EOL versions
EUDAT-B2HANDLE · Nov 18, 2024 · 9c4714e · 9c4714e
2 parents ddac4bc + c6ea4cc
commit 9c4714e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 125 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,57 +10,6 @@ pipeline {
 
     }
     stages {
-        stage ('Test python 3.5') {
-            agent {
-                dockerfile {
-                    filename "pyhandle/tests/testdockers/Dockerfile-py3.5"
-                    dir "$PROJECT_DIR"
-                    additionalBuildArgs "-t eudat-pyhandle:py3.5"
-                    args "-u root:root"
-                }
-            }
-            steps {
-                sh '''
-                    cd $WORKSPACE/$PROJECT_DIR/pyhandle/tests
-                    ./docker-entrypoint.sh coverage
-                '''
-                cobertura coberturaReportFile: '**/coverage.xml'
-            }
-        }
-        stage ('Test python 3.6') {
-            agent {
-                dockerfile {
-                    filename "pyhandle/tests/testdockers/Dockerfile-py3.6"
-                    dir "$PROJECT_DIR"
-                    additionalBuildArgs "-t eudat-pyhandle:py3.6"
-                    args "-u root:root"
-                }
-            }
-            steps {
-                sh '''
-                    cd $WORKSPACE/$PROJECT_DIR/pyhandle/tests
-                    ./docker-entrypoint.sh coverage
-                '''
-                cobertura coberturaReportFile: '**/coverage.xml'
-            }
-        }
-        stage ('Test python 3.7') {
-            agent {
-                dockerfile {
-                    filename "pyhandle/tests/testdockers/Dockerfile-py3.7"
-                    dir "$PROJECT_DIR"
-                    additionalBuildArgs "-t eudat-pyhandle:py3.7"
-                    args "-u root:root"
-                }
-            }
-            steps {
-                sh '''
-                    cd $WORKSPACE/$PROJECT_DIR/pyhandle/tests
-                    ./docker-entrypoint.sh coverage
-                '''
-                cobertura coberturaReportFile: '**/coverage.xml'
-            }
-        }
             stage ('Test python 3.9') {
             agent {
                 dockerfile {

diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.10 b/pyhandle/tests/testdockers/Dockerfile-py3.10
@@ -8,8 +8,9 @@ RUN        chown -R jenkins:jenkins /home/jenkins
 RUN        pip install \
            mock \
            pytest \
-           pytest-cov \
-           pip install -U sphinx
+           pytest-cov 
+
+RUN           pip install -U sphinx
 
 ADD        . /opt/PYHANDLE
 RUN        cd /opt/PYHANDLE && \

diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.11 b/pyhandle/tests/testdockers/Dockerfile-py3.11
@@ -8,8 +8,9 @@ RUN        chown -R jenkins:jenkins /home/jenkins
 RUN        pip install \
            mock \
            pytest \
-           pytest-cov \
-           pip install -U sphinx
+           pytest-cov 
+
+RUN           pip install -U sphinx
 
 ADD        . /opt/PYHANDLE
 RUN        cd /opt/PYHANDLE && \

diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.5 b/pyhandle/tests/testdockers/Dockerfile-py3.5
diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.6 b/pyhandle/tests/testdockers/Dockerfile-py3.6
diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.7 b/pyhandle/tests/testdockers/Dockerfile-py3.7
diff --git a/pyhandle/tests/testdockers/Dockerfile-python2.6 b/pyhandle/tests/testdockers/Dockerfile-python2.6