remove py27 testing, 1.26 and later drop python 2 support

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
ulyssessouza · Jan 8, 2020 · d0899ca · d0899ca
1 parent 94c4184
commit d0899ca
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/Release.Jenkinsfile b/Release.Jenkinsfile
@@ -2,7 +2,7 @@
 
 def dockerVersions = ['19.03.5', '18.09.9']
 def baseImages = ['alpine', 'debian']
-def pythonVersions = ['py27', 'py37']
+def pythonVersions = ['py37']
 
 pipeline {
     agent none
@@ -179,19 +179,12 @@ pipeline {
                         checkout scm
                         withCredentials([file(credentialsId: 'pypirc-docker-dsg-cibot', variable: 'PYPIRC')]) {
                             sh """
-                                virtualenv venv-publish
-                                source venv-publish/bin/activate
+                                pip install --user twine wheel
                                 python setup.py sdist bdist_wheel
-                                pip install twine
                                 twine upload --config-file ${PYPIRC} ./dist/docker-compose-${env.TAG_NAME}.tar.gz ./dist/docker_compose-${env.TAG_NAME}-py2.py3-none-any.whl
                             """
                         }
                     }
-                    post {
-                        always {
-                            sh 'deactivate; rm -rf venv-publish'
-                        }
-                    }
                 }
             }
         }
@@ -293,16 +286,14 @@ def githubRelease() {
         info.body = changelog
 
 
-        // Convert from Map --> JSON
-        def outJson = groovy.json.JsonOutput.toJson(info)
-        writeJSON file: 'release.json', text: outJson, encoding: 'UTF-8'
+        writeFile file: 'release.json', text: groovy.json.JsonOutput.toJson(info)
 
         // debug
         sh("cat release.json")
 
         def url = "https://api.github.com/repos/docker/compose/releases"
         def upload_url = sh(returnStdout: true, script: """
-            curl -sSf -H 'Authorization: token ${GITHUB_TOKEN}' -H 'Accept: application/json' -H 'Content-type: application/json' -X POST --data-binary '@release.json' $url") \\
+            curl -sSf -H 'Authorization: token ${GITHUB_TOKEN}' -H 'Accept: application/json' -H 'Content-type: application/json' -X POST --data-binary '@release.json' $url) \\
             | jq '.upload_url | .[:rindex("{")]'
         """)
         sh("""