Merge pull request #4 from bbc/jamesba-pypi

v1.0.0 release on PyPi
bbc · Aug 9, 2018 · 5e723d4 · 5e723d4
2 parents bb2cdf7 + 729b8d9
commit 5e723d4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -59,10 +59,8 @@ pipeline {
                                     env.py27_result = "FAILURE"
                                 }
                                 bbcGithubNotify(context: "tests/py27", status: "PENDING")
-                                withBBCRDPythonArtifactory {
-                                    // Use a workdirectory in /tmp to avoid shebang length limitation
-                                    sh 'tox -e py27 --recreate --workdir /tmp/$(basename ${WORKSPACE})/tox-py27'
-                                }
+                                // Use a workdirectory in /tmp to avoid shebang length limitation
+                                sh 'tox -e py27 --recreate --workdir /tmp/$(basename ${WORKSPACE})/tox-py27'
                                 script {
                                     env.py27_result = "SUCCESS" // This will only run if the sh above succeeded
                                 }
@@ -79,10 +77,8 @@ pipeline {
                                     env.py3_result = "FAILURE"
                                 }
                                 bbcGithubNotify(context: "tests/py3", status: "PENDING")
-                                withBBCRDPythonArtifactory {
-                                    // Use a workdirectory in /tmp to avoid shebang length limitation
-                                    sh 'tox -e py3 --recreate --workdir /tmp/$(basename ${WORKSPACE})/tox-py3'
-                                }
+                                // Use a workdirectory in /tmp to avoid shebang length limitation
+                                sh 'tox -e py3 --recreate --workdir /tmp/$(basename ${WORKSPACE})/tox-py3'
                                 script {
                                     env.py3_result = "SUCCESS" // This will only run if the sh above succeeded
                                 }
@@ -147,7 +143,7 @@ pipeline {
                 }
             }
             parallel {
-                stage ("Upload to Artifactory") {
+                stage ("Upload to PyPi") {
                     when {
                         anyOf {
                             expression { return params.FORCE_PYUPLOAD }
@@ -158,20 +154,20 @@ pipeline {
                     }
                     steps {
                         script {
-                            env.artifactoryUpload_result = "FAILURE"
+                            env.pypiUpload_result = "FAILURE"
                         }
-                        bbcGithubNotify(context: "artifactory/upload", status: "PENDING")
+                        bbcGithubNotify(context: "pypi/upload", status: "PENDING")
                         sh 'rm -rf dist/*'
-                        bbcMakeWheel("py27")
-                        bbcMakeWheel("py3")
-                        bbcTwineUpload(toxenv: "py3")
+                        bbcMakeGlobalWheel("py27")
+                        bbcMakeGlobalWheel("py3")
+                        bbcTwineUpload(toxenv: "py3", pypi: true)
                         script {
-                            env.artifactoryUpload_result = "SUCCESS" // This will only run if the steps above succeeded
+                            env.pypiUpload_result = "SUCCESS" // This will only run if the steps above succeeded
                         }
                     }
                     post {
                         always {
-                            bbcGithubNotify(context: "artifactory/upload", status: env.artifactoryUpload_result)
+                            bbcGithubNotify(context: "pypi/upload", status: env.pypiUpload_result)
                         }
                     }
                 }

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 # Basic metadata
 name = 'mediajson'
-version = '1.0.0-dev3'
+version = '1.0.0'
 description = 'A JSON serialiser and parser for python that supports extensions convenient for our media grain formats'
 url = 'https://github.com/bbc/rd-apmm-python-lib-mediajson'
 author = u'James P. Weaver'
@@ -49,7 +49,7 @@ def find_packages(path, base=""):
 # This is where you list packages which are required
 packages_required = [
     "six",
-    "mediatimestamp >= 1.0.0-dev4"
+    "mediatimestamp >= 1.0.0"
 ]
 
 # This is where you list locations for packages not