From 559cdbb48ec83aee99b597887075dced9ea47d83 Mon Sep 17 00:00:00 2001
From: "James P. Weaver" <james.barrett@bbc.co.uk>
Date: Thu, 9 Aug 2018 16:56:00 +0100
Subject: [PATCH 1/3] Modified Jenkinsfile to not use artifactory

---
 Jenkinsfile | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1881bbf..e42b325 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,10 +59,7 @@ 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'
-                                }
+                                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 +76,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 +142,7 @@ pipeline {
                 }
             }
             parallel {
-                stage ("Upload to Artifactory") {
+                stage ("Upload to PyPi") {
                     when {
                         anyOf {
                             expression { return params.FORCE_PYUPLOAD }
@@ -158,20 +153,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)
                         }
                     }
                 }

From ee85e59acb88bd76b259ce341c3709bb63b08de1 Mon Sep 17 00:00:00 2001
From: "James P. Weaver" <james.barrett@bbc.co.uk>
Date: Thu, 9 Aug 2018 16:56:38 +0100
Subject: [PATCH 2/3] Change requirement to mediatimestamp 1.0.0

---
 Jenkinsfile | 1 +
 setup.py    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e42b325..54d5882 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,6 +59,7 @@ pipeline {
                                     env.py27_result = "FAILURE"
                                 }
                                 bbcGithubNotify(context: "tests/py27", status: "PENDING")
+                                // 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
diff --git a/setup.py b/setup.py
index 036684b..3c32db3 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 # Basic metadata
 name = 'mediajson'
-version = '1.0.0-dev3'
+version = '1.0.0-dev4'
 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

From 729b8d97333abb2640af0da7351c4e497d74aa5b Mon Sep 17 00:00:00 2001
From: "James P. Weaver" <james.barrett@bbc.co.uk>
Date: Thu, 9 Aug 2018 17:14:30 +0100
Subject: [PATCH 3/3] v1.0.0 Version release

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 3c32db3..9825376 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 # Basic metadata
 name = 'mediajson'
-version = '1.0.0-dev4'
+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'