Make travis upload to pypi

Author: Clark Perkins

.travis.yml

@@ -2,20 +2,13 @@ language: python
 
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
 
 cache:
   directories:
     - $HOME/.cache/pip
 
-# Set up our environment
-env:
-  NOSE_WITH_XUNIT: 1
-  NOSE_WITH_COVERAGE: 1
-  NOSE_COVER_BRANCHES: 1
-  NOSE_COVER_INCLUSIVE: 1
-
 # So that we get a docker container
 sudo: false
 
@@ -37,18 +30,30 @@ script:
 # Only build artifacts on success
 after_success:
   - coveralls
-  - export STACKDIO_VERSION=`python setup.py --version`
   - python setup.py sdist
   - python setup.py bdist_wheel
 
 deploy:
-  provider: releases
-  api_key:
-    secure: T4jI1aZQ+wDJBgGxcbdrtLz3zpXA9yZwmrsm8d3GqEGxApMtkKLWq0uqf86C8VkqaY6p4Nm1a/PTApV1isbuSoJbdeMVJA1MlYB/G7QMK7eI8nFqkw7Q4jzuOdEC0D1CPZx7ZWBn0bYxSRTcSeQSnGeGDy2KxekGSZFfIxe4APo=
-  file:
-    - dist/stackdio-${STACKDIO_VERSION}.tar.gz
-    - dist/stackdio-${STACKDIO_VERSION}-py2.py3-none-any.whl
-  skip_cleanup: true
-  on:
-    tags: true
-    repo: stackdio/stackdio-python-client
+  - provider: releases
+    api_key:
+      secure: T4jI1aZQ+wDJBgGxcbdrtLz3zpXA9yZwmrsm8d3GqEGxApMtkKLWq0uqf86C8VkqaY6p4Nm1a/PTApV1isbuSoJbdeMVJA1MlYB/G7QMK7eI8nFqkw7Q4jzuOdEC0D1CPZx7ZWBn0bYxSRTcSeQSnGeGDy2KxekGSZFfIxe4APo=
+    file:
+      - dist/stackdio-${TRAVIS_TAG}.tar.gz
+      - dist/stackdio-${TRAVIS_TAG}-py2.py3-none-any.whl
+    skip_cleanup: true
+    on:
+      tags: true
+      repo: stackdio/stackdio-python-client
+      python: "2.7"
+
+  # Upload to pypi.  Do this instead of the pypi provider so that we
+  # ensure the exact same artifact is uploaded to github and pypi.
+  # The pypi provider will re-build the 2 artifacts, which is not ideal.
+  # This requires setting TWINE_USERNAME and TWINE_PASSWORD in travis.
+  - provider: script
+    script: twine upload dist/stackdio-${TRAVIS_TAG}.tar.gz dist/stackdio-${TRAVIS_TAG}-py2.py3-none-any.whl
+    skip_cleanup: true
+    on:
+      tags: true
+      repo: stackdio/stackdio-python-client
+      python: "2.7"

setup.py

@@ -15,7 +15,6 @@
 # limitations under the License.
 #
 
-import os
 import sys
 
 from setuptools import setup, find_packages
@@ -25,9 +24,9 @@ def test_python_version():
     major = sys.version_info[0]
     minor = sys.version_info[1]
     micro = sys.version_info[2]
-    if float('%d.%d' % (major, minor)) < 2.6:
+    if (major, minor) < (2, 7):
         err_msg = ('Your Python version {0}.{1}.{2} is not supported.\n'
-                   'stackdio-server requires Python 2.6 or newer.\n'.format(major, minor, micro))
+                   'stackdio-server requires Python 2.7 or newer.\n'.format(major, minor, micro))
         sys.stderr.write(err_msg)
         sys.exit(1)
 
@@ -85,7 +84,6 @@ def test_python_version():
             'console_scripts': [
                 'stackdio-cli=stackdio.cli:main',
                 'blueprint-generator=stackdio.cli.blueprints:main',
-                'stackdio-config-convert=stackdio.client.config:main',
             ],
         },
         classifiers=[
@@ -99,8 +97,8 @@ def test_python_version():
             'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.3',
             'Programming Language :: Python :: 3.4',
+            'Programming Language :: Python :: 3.5',
             'Topic :: System :: Clustering',
             'Topic :: System :: Distributed Computing',
         ]