Merge pull request #101 from rosette-api/RCB-616-release-python-binding

RCB-616: update python Jenkins script

Author: matt-l-01

.gitignore

@@ -7,6 +7,9 @@
 ehthumbs.db
 Thumbs.db
 
+# VS Code
+.vscode
+
 # Jetbrains
 **/.idea/*
 !**/.idea/runConfigurations/
@@ -59,6 +62,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
+.scannerwork/
 
 # Translations
 *.mo

.travis.yml

@@ -0,0 +1,54 @@
+
+
+def versions = [3.11, 3.10, 3.9, 3.8, 3.7]
+
+def runSonnarForPythonVersion(sourceDir, ver){
+    mySonarOpts="-Dsonar.sources=/source -Dsonar.host.url=${env.SONAR_HOST_URL} -Dsonar.login=${env.SONAR_AUTH_TOKEN}"
+    if("${env.CHANGE_ID}" != "null"){
+        mySonarOpts = "$mySonarOpts -Dsonar.pullrequest.key=${env.CHANGE_ID} -Dsonar.pullrequest.branch=${env.BRANCH_NAME}"
+    } else {
+        mySonarOpts = "$mySonarOpts -Dsonar.branch.name=${env.BRANCH_NAME}"
+    } 
+    if ("${env.CHANGE_BRANCH}" != "null") {
+        mySonarOpts="$mySonarOpts -Dsonar.pullrequest.base=${env.CHANGE_TARGET} -Dsonar.pullrequest.branch=${env.CHANGE_BRANCH}"
+    }
+
+    // TODO: find a way to skip the Sonar scan for all those version, but one (maybe the latest?).
+    sh "docker run \
+            --pull always \
+            --rm --volume ${sourceDir}:/source \
+            python:${ver}-slim \
+            bash -c \"apt-get update && \
+            apt-get install -y wget unzip && \
+            pip3 install tox && \
+            cd /root/ && \
+            wget -q https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.8.0.2856-linux.zip && \
+            unzip -q sonar-scanner-cli-4.8.0.2856-linux.zip && \
+            cd /source && \
+            tox && \
+            /root/sonar-scanner-4.8.0.2856-linux/bin/sonar-scanner \
+            ${mySonarOpts}\""
+}
+
+node ("docker-light") {
+    def sourceDir = pwd()
+    try {
+        stage("Clean up") {
+            step([$class: 'WsCleanup'])
+        }
+        stage("Checkout Code") {
+            checkout scm
+        }
+        stage("Build & Test") {
+            withSonarQubeEnv {
+                
+                versions.each { ver ->
+                    runSonnarForPythonVersion(sourceDir, ver)
+                }
+            }
+        }
+    } catch (e) {
+        currentBuild.result = "FAILED"
+        throw e
+    }
+}

CI.Jenkinsfile

@@ -15,8 +15,8 @@ node ("docker-light") {
             echo "${env.ALT_URL}"
             def useUrl = ("${env.ALT_URL}" == "null") ? "${env.BINDING_TEST_URL}" : "${env.ALT_URL}"
             withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${useUrl}"]) {
-                sh "docker pull rosetteapi/docker-python"
-                sh "docker run --rm -e API_KEY=${API_KEY} -e ALT_URL=${ALT_URL} -v ${SOURCEDIR}:/source rosetteapi/docker-python"
+                sh "docker pull rosette/docker-python"
+                sh "docker run --rm -e API_KEY=${API_KEY} -e ALT_URL=${ALT_URL} -v ${SOURCEDIR}:/source rosette/docker-python"
             }
         }
         slack(true)

Jenkinsfile

@@ -2,7 +2,6 @@
 
 ---
 
-[![Build Status](https://travis-ci.org/rosette-api/python.svg?branch=develop)](https://travis-ci.org/rosette-api/python)
 [![PyPI version](https://badge.fury.io/py/rosette-api.svg)](https://badge.fury.io/py/rosette-api)
 [![Python Versions](https://img.shields.io/pypi/pyversions/rosette-api.svg?color=dark%20green&label=Python%20Versions)](https://img.shields.io/pypi/pyversions/rosette-api.svg?color=dark%20green&label=Python%20Versions)
 

README.md

@@ -153,14 +153,12 @@ class DocumentParameters(_DocumentParamSetBase):
     def __init__(self):
         """Create a L{DocumentParameters} object."""
         _DocumentParamSetBase.__init__(
-            self, ("content", "contentUri", "genre", "language", "profileId"))
+            self, ("content", "contentUri", "language", "profileId"))
         self.file_name = ""
         self.use_multipart = False
 
     def validate(self):
         """Internal. Do not use."""
-        if self["genre"] is not None:
-            warnings.warn("genre is deprecated and will be removed in the next release.")
         if self["content"] is None:
             if self["contentUri"] is None:
                 raise RosetteException(

rosette/api.py

@@ -49,11 +49,11 @@ def read(*filenames, **kwargs):
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ]
 )

setup.py

@@ -5,7 +5,7 @@
 
 [tox]
 skipsdist = True
-envlist = py2, py3
+envlist = py3
 
 [testenv]
 commands =