Merge branch 'master' of github.com:ekolve/testpython

Author: Eric Kolve

.travis.yml

@@ -1,28 +1,20 @@
 language: python
 python:
-- '3.6'
+    - '3.6'
 install:
-- pip install requests
+    - pip install requests invoke
 cache: pip
 script:
     - true
-    - env
-    - git describe --tags --exact-match
-    - git branch --format='%(refname:short)' --contains tags/$TRAVIS_TAG
 git:
-  depth: 3
+    depth: 3
 deploy:
-  provider: pypi
-  username: __token__
-  password: 
-    secure: m9SRup4q7R4plc1fuKUQE9y/M+vWeTbu/pYaizwRTN5HjhEXcnyg63gAkr/EO4T2VzKCobOsDJaySFmFfWYWkfktWLaw47dhtrbwrrPFeaCjg+wqF9y3jN5wvVlUwDPoaBJtFi3KL28aFg+RY+iO/bXUFgURRVUbnhK/vf39THcuSeo5Fys+jJKfWBIjxB6vyUR124WNkmFpLGgiDqxQXv1Mk+xPMSsry2iawTpZjyxeokpzA1rO5BX+orcMEs5Vm4x2eLVHtTtoqjY0UEvbclH/kA4u0XCT8FjdP+Kmv/qAP+hJALQk/IBSa5Id2VcGU5at65BvOpssWGXp60UPSOvLWLfoZIXBOPBOif3gJIbhfQGgoA7z+7dEChOx4ZlybDMguRWm4hupHZnkcZqftCmyV6lKTBdT8TGSuG+B1r6kmgLdg8yShvcnU3OaIgSpAQTN4LNJ5r+Ll4vdYCgbUy/YUOGsasxODJiPbxK+mOuDKtuVU6CV22TPVNKq+sdUWOq7ZbhwGVKneEJHTwnHvo+nWt9zsC8QGJXOuzBzhnFCdGcgH6Q4KbwpYqUMlB2/s79g6H3auVV6jiubl49LhxjUdHsp40GV+Nlt9ThIN2XHsPcicRMKDzYc+UjvY9u7hk2MMcvbwg7hfoYVaEy9sPb25vw7r31xS5u4IBBhWw4=
-  server: https://test.pypi.org/legacy/
-  edge: true
-  distributions: sdist bdist_wheel --universal
-  on:
-    tags: true
-    condition: $(git describe --tags --exact-match) && $TRAVIS_TAG =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ && $(git branch --format='%(refname:short)' --contains tags/$TRAVIS_TAG) = 'master'
-
+    provider: script
+    script: bash build.sh
+    on:
+        tags: true
+        condition: $TRAVIS_TAG =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$
 env:
-  global:
-    secure: m9SRup4q7R4plc1fuKUQE9y/M+vWeTbu/pYaizwRTN5HjhEXcnyg63gAkr/EO4T2VzKCobOsDJaySFmFfWYWkfktWLaw47dhtrbwrrPFeaCjg+wqF9y3jN5wvVlUwDPoaBJtFi3KL28aFg+RY+iO/bXUFgURRVUbnhK/vf39THcuSeo5Fys+jJKfWBIjxB6vyUR124WNkmFpLGgiDqxQXv1Mk+xPMSsry2iawTpZjyxeokpzA1rO5BX+orcMEs5Vm4x2eLVHtTtoqjY0UEvbclH/kA4u0XCT8FjdP+Kmv/qAP+hJALQk/IBSa5Id2VcGU5at65BvOpssWGXp60UPSOvLWLfoZIXBOPBOif3gJIbhfQGgoA7z+7dEChOx4ZlybDMguRWm4hupHZnkcZqftCmyV6lKTBdT8TGSuG+B1r6kmgLdg8yShvcnU3OaIgSpAQTN4LNJ5r+Ll4vdYCgbUy/YUOGsasxODJiPbxK+mOuDKtuVU6CV22TPVNKq+sdUWOq7ZbhwGVKneEJHTwnHvo+nWt9zsC8QGJXOuzBzhnFCdGcgH6Q4KbwpYqUMlB2/s79g6H3auVV6jiubl49LhxjUdHsp40GV+Nlt9ThIN2XHsPcicRMKDzYc+UjvY9u7hk2MMcvbwg7hfoYVaEy9sPb25vw7r31xS5u4IBBhWw4=
+    global:
+        secure: VyGJAszOT/AWo2RZe7Yt3JlORQSXzMly4YR+C2Xl96W0TkhjpQcra0i38GXaudFWyu2dAK5LGdwzj3Epdux9/3g88vJd6Bit27F1aTbLFWqCSDJ4clsD5KE1HQO9807tdtxf6Z1BbmvtC9IfyCCXTMr9AXtyIdkHIKYuqSRbS6mA7ZgnN7DUgq3/Q14jkiZ2KGdhtYpOnaLPnt/8BfbsrxvXNRgBBrX4kDeF4R0mu9ZYQ7CT36rBFUTht1V82/8726OUc7YYH/Q3884ty0shJ9mz0sF5Smp9zzypjdB1aDFD5NNTKvdJ4puiDeUdHKtqS+xdbe8YaIqyfUXIzdywBcwT4I7hg2n21Etud2mnDA2K8bW/C22ur6dQiaYD0UeL93sKMW4tBN+M3QEwjpiNS34+kSAXXATkFfyz0UXlKzJlWvvvJ/68aumBVXIUnWjieIurjTjOIaJs6DyACDF/7CnZ5lGk8I6wSKWVV3KeQ3JDnM+i7SMNS3dkXpN2x7YwJk2udcfvQe1jGqJ1U3jHmaVlc4fBiRYG8Gp/rorO3Apsex3dz5tiSvF2gCY7Y6KiXoCk1oYT6QzEHGRT/0BUxW4PVEL6COzYayRubQsqdawc8nemgR+p1ydW0lUe3hR6xfXmpDqc3pcGjs8XMwvS9qXYqNpqIY7YNlgjzi/HOtI=
+

build.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+pip3 install -e .
+pip3 install twine wheel invoke requests
+
+if [[ $(git rev-parse --is-shallow-repository) == 'true' ]]; then
+    git fetch --unshallow
+    git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+    git fetch origin
+fi;
+
+invoke build-pip
+invoke deploy-pip
+twine upload --repository testpypi -u __token__ dist/*

build/lib/test/__init__.py

@@ -0,0 +1,4 @@
+import mypackage
+
+def test_thing():
+    mypackage.mything(10)

build/lib/test/test_ocr.py

@@ -4,7 +4,7 @@
 
 
 git_tag_version = (
-    subprocess.check_output("git describe --tags", shell=True)
+    subprocess.check_output("git describe --tags --exact-match", shell=True)
     .decode("ascii")
     .strip()
 )

setup.py

@@ -0,0 +1,43 @@
+from invoke import task
+import subprocess
+import os
+import requests
+
+
+
+@task
+def build_pip(context):
+    import xml.etree.ElementTree as ET 
+    res = requests.get('https://test.pypi.org/rss/project/ekolve-testpython/releases.xml')
+    res.raise_for_status()
+
+    git_tag_version = (
+        subprocess.check_output("git describe --tags --exact-match", shell=True)
+        .decode("ascii")
+        .strip()
+    )
+
+    root = ET.fromstring(res.content)
+    latest_version = None
+
+    for title in root.findall('./channel/item/title'): 
+        latest_version = title.text
+        break
+    
+    current_maj, current_min, current_sub = list(map(int, latest_version.split('.')))
+    next_maj, next_min, next_sub = list(map(int, git_tag_version.split('.')))
+
+    if (next_maj > current_maj) or \
+        (next_maj >= current_maj and next_min > current_min) or \
+        (next_maj >= current_maj and next_min >= current_min and next_sub > current_sub):
+        subprocess.check_call("python setup.py sdist bdist_wheel --universal", shell=True)
+    else:
+        raise Exception("Invalid version: %s is not greater than latest version %s" % (git_tag_version, latest_version))
+        
+
+@task
+def deploy_pip(context):
+    if 'TWINE_PASSWORD' not in os.environ:
+        raise Exception("Twine token not specified in environment")
+    subprocess.check_call("twine upload --repository testpypi -u __token__ dist/*", shell=True)
+