From 545a09728895aa827e78a5cd7519b22e5f94ca4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?=
 <stephane.bidoul@acsone.eu>
Date: Wed, 25 Jan 2017 19:22:39 +0100
Subject: [PATCH 1/2] [IMP] simplify release process using setuptools_scm

---
 .travis.yml | 12 ++++++++++++
 DEVELOP.rst | 18 ++++++++++++++++++
 setup.py    |  5 ++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 DEVELOP.rst

diff --git a/.travis.yml b/.travis.yml
index 8ad75ff..8526194 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,3 +28,15 @@ script:
 
 after_success:
   - coveralls
+
+deploy:
+  provider: pypi
+  user: acsbidoul
+  password:
+    secure: LGD5/HQLvHCV9BRaPF2J73Qs6OBnlA4iDL78Wab9TRPG1Wi8SfuuG2h3tOgHVfVtTOZKA6dhyAQF07/K5sp/fvvOlVp1og9Dda8s1gUhKSb9JRal37fukm7bTfUZQPXlZrC/Xmnw+CRPRcEfRfFzHv3827pxnC9LSktU1kwvl2VkeQ+nrFhmOvhkE+IK8aTHlRA18zZOA3PZLwEJQWuxxbK3/MK6Z5LTokMVIXNZncaammY/aAtzPHdz+W5PPSGAOSEMGzu80Oql+6eRzf9pPNquejZ1aNP1zPlKg939+FCL+DP6D9XXeB+xe31JWeaA5ZUeR4KnyF1n7Cz4Gge8c4H6nYGLayZErxLY/jRVc/mfwofipmN54pUUm/6cAt7ROFL/BlL3QHWZQRKRff0VWP36B4vhP7lHLpePH3EJWvD1VW08sQzcSbiicNk1jVb+VBou4L5PwvLJ1CFGjBjpxpVn3me1KQZaFzr9l8MlJXR4Ikf4FJOMJw06erPmlRPUd9F+KhYHEb3/MawH8cp2pwzxswen4gOXIHbCyP/uuUEadDVL7mEfr1zgxqCfsO/OB4pf9DX/AVCI+QLx1ekJQx/NMQmIxe6ssmFJsF/TX9hqG02YrW/vnx1NQiIhuDueRJ0ippPYH01wDMvsf42z+PAPUxhexnK2/gGf0hj9JQE=
+  distributions: "sdist bdist_wheel"
+  skip_upload_docs: true
+  on:
+    repo: acsone/git-aggregator
+    branch: master
+    tags: true
diff --git a/DEVELOP.rst b/DEVELOP.rst
new file mode 100644
index 0000000..8518cf0
--- /dev/null
+++ b/DEVELOP.rst
@@ -0,0 +1,18 @@
+Developer instructions
+~~~~~~~~~~~~~~~~~~~~~~
+
+How to run tests
+----------------
+
+* run ``tox`` (if not installed ``apt-get install tox``)
+
+How to release
+--------------
+
+* python setup.py check --restructuredtext
+* commit everything
+* make sure tests pass!
+* git tag <version>, where <version> is PEP 440 compliant
+* git push --tags
+
+Uploading of tagged versions to pypi will be taken care of by travis.
diff --git a/setup.py b/setup.py
index a046bd0..4fc22dc 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name='git-aggregator',
-    version='1.0.1.dev0',
+    use_scm_version=True,
     description='A library to aggregate git branches from different remotes '
                 'into a consolidated one',
     long_description=open('README.rst').read(),
@@ -32,6 +32,9 @@
     packages=[
         'git_aggregator',
     ],
+    setup_requires=[
+        'setuptools_scm',
+    ],
     install_requires=[
         'kaptan',
         'argcomplete',

From c748111cdfda3d1c248267bb972358951bf3bd88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?=
 <stephane.bidoul@acsone.eu>
Date: Wed, 25 Jan 2017 19:27:23 +0100
Subject: [PATCH 2/2] pep8

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

diff --git a/setup.py b/setup.py
index 4fc22dc..9637928 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
         'Framework :: GIT',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: '
-            'GNU Affero General Public License v3 or later (AGPLv3+)',
+        'GNU Affero General Public License v3 or later (AGPLv3+)',
         'Operating System :: POSIX',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',