pyannotators-patterns 0.6.1__tar.gz → 0.6.5__tar.gz

{pyannotators_patterns-0.6.1 → pyannotators_patterns-0.6.5}/Jenkinsfile

@@ -1,4 +1,17 @@
+#!groovy
+// to test groovy snippets online:
+//    https://www.jdoodle.com/execute-groovy-online
+
 pipeline {
+
+  agent none
+
+  triggers {
+    upstream(upstreamProjects: 'pymultirole_plugins/' + BRANCH_NAME.replaceAll('/', '%2F'),\
+                                threshold: hudson.model.Result.SUCCESS)
+  }
+
+  // variables declared in environment block can not be changed in any steps/stages
   environment {
     PATH_HOME = '/home/jenkins'
     TEST_REPORT_DIR = '/root/test-reports'
@@ -10,13 +23,6 @@ pipeline {
     MINOR_VERSION = '6'
   }
 
-  agent none
-
-  triggers {
-    upstream(upstreamProjects: 'pymultirole_plugins/' + BRANCH_NAME.replaceAll('/', '%2F'),\
-                                threshold: hudson.model.Result.SUCCESS)
-  }
-
   stages {
     stage('Catch build termination') {
       agent {
@@ -66,7 +72,9 @@ pipeline {
               // push updates of file __init__.py
               withCredentials([gitUsernamePassword(credentialsId: 'bitbucket-user', gitToolName: 'git-tool')]) {
                 sh 'git pull'
-                sh "printf '\"\"\"Annotator based on Presidio pattern recognizer\"\"\"\n\n__version__ = \"${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_ID}\"\n' > src/pyannotators_patterns/__init__.py"
+                sh "echo '\"\"\"Annotator based on Presidio pattern recognizer\"\"\"' > src/pyannotators_patterns/__init__.py"
+                sh "echo '' >> src/pyannotators_patterns/__init__.py"
+                sh "echo '__version__ = \"${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_ID}\"' >> src/pyannotators_patterns/__init__.py"
                 sh 'git commit src/pyannotators_patterns/__init__.py -m "[Jenkins CI] Commit on version files" || echo "No changes to commit"'
                 sh 'git push'
               }
@@ -98,6 +106,7 @@ pipeline {
       stages {
         stage('Install dependencies') {
           steps {
+            sh 'pip install uv'
             sh 'uv sync --extra test'
           }
         }
@@ -114,8 +123,8 @@ pipeline {
 
         stage('Publish on PyPI') {
           environment {
-            UV_PUBLISH_USERNAME = getUserName('.env')
-            UV_PUBLISH_PASSWORD = getUserPass('.env')
+            UV_PUBLISH_USERNAME = getUserName '.env'
+            UV_PUBLISH_PASSWORD = getUserPass '.env'
           }
           steps {
             // remove any previous folder dist
@@ -169,7 +178,7 @@ pipeline {
             }
             if (sendEmailNotif("${PATH_HOME}/${JOB_NAME}", "${BUILD_NUMBER}")) {
               println 'sending Success Build notification'
-              CUSTOM_SUBJECT = '[CI - Jenkinzz SUCCESS] ' + CUSTOM_SUBJECT
+              def CUSTOM_SUBJECT = '[CI - Jenkinzz SUCCESS] ' + CUSTOM_SUBJECT
               emailext(
                   mimeType: 'text/html',
                   subject: CUSTOM_SUBJECT,
@@ -204,7 +213,7 @@ pipeline {
               println 'Exception occurred: ' + e.toString()
             }
             println 'sending Failure Build notification'
-            CUSTOM_SUBJECT = '[CI - Jenkinzz FAILURE] ' + CUSTOM_SUBJECT
+            def CUSTOM_SUBJECT = '[CI - Jenkinzz FAILURE] ' + CUSTOM_SUBJECT
             emailext(
                 mimeType: 'text/html',
                 subject: CUSTOM_SUBJECT,
@@ -228,7 +237,7 @@ pipeline {
 
 // return UV_PUBLISH_USERNAME from given file (reads FLIT_USERNAME key)
 def getUserName(path) {
-  USERNAME = sh(
+  def USERNAME = sh(
                  script: "grep FLIT_USERNAME ${path}|cut -d '=' -f2",
                  returnStdout: true
                ).trim()
@@ -237,7 +246,7 @@ def getUserName(path) {
 
 // return UV_PUBLISH_PASSWORD from given file (reads FLIT_PASSWORD key)
 def getUserPass(path) {
-  USERPASS = sh(
+  def USERPASS = sh(
                  script: "grep FLIT_PASSWORD ${path}|cut -d '=' -f2",
                  returnStdout: true
                ).trim()
@@ -257,11 +266,11 @@ def switchEmailNotif(toggle, build) {
 
 // return true if emailNotif file present
 boolean sendEmailNotif(path, build) {
-  emailNotif = sh(
+  def emailNotif = sh(
                  script: "find ${path} -name '.emailNotif'|wc -l",
                  returnStdout: true
                ).trim()
-  emailContent = ''
+  def emailContent = ''
   if (emailNotif == '1') {
     emailContent = sh(
                      script: "cat ${path}/.emailNotif",
@@ -272,7 +281,7 @@ boolean sendEmailNotif(path, build) {
 }
 
 def analyseBuildCause() {
-  upstreamProjects = ['pyimporters_plugins']
+  String[] upstreamProjects = ['pymultirole_plugins']
   boolean upstreamRunning = false
   String jobName
   // iterate over upstreamProjects
@@ -396,6 +405,6 @@ def analyseBuildCause() {
     println 'Skipping build because last commit has been done by CI'
     env.SKIP_JOB = '1'
     switchEmailNotif(false, 0)
-    //currentBuild.result = 'NOT_BUILT'
+    currentBuild.result = 'NOT_BUILT'
   }
 }

{pyannotators_patterns-0.6.1 → pyannotators_patterns-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyannotators-patterns
-Version: 0.6.1
+Version: 0.6.5
 Summary: Annotator based on Presidio pattern recognizer
 Project-URL: Homepage, https://github.com/oterrier/pyannotators_patterns/
 Author-email: Olivier Terrier <olivier.terrier@kairntech.com>

{pyannotators_patterns-0.6.1 → pyannotators_patterns-0.6.5}/src/pyannotators_patterns/__init__.py

@@ -1,3 +1,3 @@
 """Annotator based on Presidio pattern recognizer"""
 
-__version__ = "0.6.1"
+__version__ = "0.6.5"