Merge pull request #125 from EUDAT-B2HANDLE/devel

Version 1.4.1
EUDAT-B2HANDLE · Nov 26, 2024 · abd97ff · abd97ff
2 parents d31ae19 + 8c7ef5a
commit abd97ff
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -61,6 +61,40 @@ pipeline {
                 cobertura coberturaReportFile: '**/coverage.xml'
             }
         }
+        stage ('Test python 3.12') {
+            agent {
+                dockerfile {
+                    filename "pyhandle/tests/testdockers/Dockerfile-py3.12"
+                    dir "$PROJECT_DIR"
+                    additionalBuildArgs "-t eudat-pyhandle:py3.12"
+                    args "-u root:root"
+                }
+            }
+            steps {
+                sh '''
+                    cd $WORKSPACE/$PROJECT_DIR/pyhandle/tests
+                    ./docker-entrypoint-310.sh coverage
+                '''
+                cobertura coberturaReportFile: '**/coverage.xml'
+            }
+        }
+         stage ('Test python 3.13') {
+            agent {
+                dockerfile {
+                    filename "pyhandle/tests/testdockers/Dockerfile-py3.13"
+                    dir "$PROJECT_DIR"
+                    additionalBuildArgs "-t eudat-pyhandle:py3.13"
+                    args "-u root:root"
+                }
+            }
+            steps {
+                sh '''
+                    cd $WORKSPACE/$PROJECT_DIR/pyhandle/tests
+                    ./docker-entrypoint-310.sh coverage
+                '''
+                cobertura coberturaReportFile: '**/coverage.xml'
+            }
+        }
         stage ('Upload to PyPI'){
             when {
                 branch 'master'

diff --git a/pyhandle/__init__.py b/pyhandle/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.3.1"
+__version__ = "1.4.1"
 # The version as used in setup.py and docs/source/conf.py.
 
 # IMPORTANT

diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.12 b/pyhandle/tests/testdockers/Dockerfile-py3.12
@@ -0,0 +1,25 @@
+# vim:set ft=dockerfile:
+FROM       python:3.12
+
+RUN        useradd jenkins 
+RUN        mkdir -p /home/jenkins/
+RUN        chown -R jenkins:jenkins /home/jenkins
+
+RUN python -m ensurepip --upgrade
+
+RUN        pip install \
+           mock \
+           pytest \
+           pytest-cov \
+           setuptools \
+           wheel
+
+RUN           pip install -U sphinx
+
+ADD        . /opt/PYHANDLE
+RUN        cd /opt/PYHANDLE && \
+           python setup.py install
+
+WORKDIR    /opt/PYHANDLE/pyhandle/tests
+
+CMD ["./docker-entrypoint-310.sh", "coverage"]
diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.13 b/pyhandle/tests/testdockers/Dockerfile-py3.13
@@ -0,0 +1,25 @@
+# vim:set ft=dockerfile:
+FROM       python:3.13
+
+RUN        useradd jenkins 
+RUN        mkdir -p /home/jenkins/
+RUN        chown -R jenkins:jenkins /home/jenkins
+
+RUN python -m ensurepip --upgrade
+
+RUN        pip install \
+           mock \
+           pytest \
+           pytest-cov \
+           setuptools \
+           wheel
+
+RUN           pip install -U sphinx
+
+ADD        . /opt/PYHANDLE
+RUN        cd /opt/PYHANDLE && \
+           python setup.py install
+
+WORKDIR    /opt/PYHANDLE/pyhandle/tests
+
+CMD ["./docker-entrypoint-310.sh", "coverage"]
diff --git a/setup.py b/setup.py
@@ -73,6 +73,8 @@ def find_version(*file_paths):
           'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: 3.11',
+          'Programming Language :: Python :: 3.12',
+          'Programming Language :: Python :: 3.13',
           'License :: OSI Approved :: Apache Software License',
           'Intended Audience :: Developers',
           'Topic :: Software Development :: Libraries :: Python Modules',