Merge 162dd0e into cedeecf

.travis.yml

@@ -1,18 +1,28 @@
 language: python
 python:
-  - 2.6
-  - 2.7
-  - 3.3
-  - 3.4
-  - 3.5
-  - 3.6
+- 2.7
+- 3.3
+- 3.4
+- 3.5
+- 3.6
 install:
-  - pip install -q -r requirements.txt --use-wheel
-  - pip install -q coverage coveralls --use-wheel
+- pip install -q -r requirements.txt
+- pip install -q coverage coveralls
 script:
-  - py.test --cov=pypuppetdb --pep8  -v
-  - ./bandit.sh
+- py.test --cov=pypuppetdb --pep8  -v
+- "./bandit.sh"
 after_success:
-  - coveralls
+- coveralls
 notifications:
   email: false
+
+before_deploy:
+  - python setup.py sdist bdist_wheel
+
+deploy:
+  provide: pypi
+  user: mterzo
+  password:
+    secure: dxjpyS3Xw1Ma1CZ/Ao+iEVGI7mloX/WvWFXIQCoghggosWwjo+Uo2WUcjc/SAe+ixn+4lvowXT0tkbc24ZpdP8QwroB5o4xy7xRm0SIajfp1xUZcZJo6nIIycJ8g5fP83KNgDnL3LeLj0kpazPaIZAugJyFyasExY2eI1NT207w=
+  on:
+    tags: true

MANIFEST.in

@@ -2,3 +2,4 @@ include README.rst
 include CHANGELOG.rst
 include LICENSE
 include requirements.txt
+include version

setup.py

@@ -6,9 +6,14 @@
 from setuptools.command.test import test as TestCommand
 
 
-if sys.argv[-1] == 'publish':
-    os.system('python setup.py sdist upload')
-    sys.exit()
+def rc_value():
+    with open('version') as fp:
+        val = fp.read().rstrip()
+    return '{}rc0'.format(val)
+
+
+def version():
+    return os.getenv('TRAVIS_TAG', rc_value())
 
 
 class Tox(TestCommand):
@@ -32,7 +37,7 @@ def run_tests(self):
 
 setup(
     name='pypuppetdb',
-    version='0.3.3',
+    version=version(),
     author='Corey Hammerton',
     author_email='corey.hammerton@gmail.com',
     packages=find_packages(),

version

@@ -0,0 +1 @@
+3.3.0