Refactored packaging to use pbr

Signed-off-by: Sorin Sbarnea <[email protected]>

Author: ssbarnea

.gitignore

@@ -1,4 +1,19 @@
-/build
-/dist
-/.tox
-*.egg-info
+.idea/
+*.bak
+*.egg
+*.egg-info/
+*.pyc
+.cache/
+.coverage
+.coverage.*
+.eggs/
+.tox/
+amps-standalone
+build
+coverage.xml
+**/*.log
+/.python-version
+/CHANGELOG
+/ChangeLog
+/AUTHORS
+/tests/build

.travis.yml

@@ -8,75 +8,65 @@ python:
 - '2.7'
 - '3.4'
 - '3.5'
+- '3.6'
+install:
+- pip -q --log dist/pip.log install --upgrade pip setuptools tox-travis py wheel
+- python setup.py sdist bdist_wheel install
+- pip install ./dist/*.whl
+- pip --version
 script:
-- travis_wait python setup.py test
-- export PACKAGE_VERSION=$(python -c "from jira import __version__; print(__version__)")
+- export PACKAGE_NAME=$(python setup.py --name)
+- export PACKAGE_VERSION=$(python setup.py --version)
+- python setup.py --version
+- tox --installpkg ./dist/*.whl --travis-after
+# validates that the build source distribution is installable using the old easy_install
+- pip uninstall -y $PACKAGE_NAME && easy_install ./dist/$PACKAGE_NAME-*.tar.gz
 after_success:
-- python travis_after_all.py
-- export $(cat .to_export_back)
-- |
-  if [ "$BUILD_LEADER" = "YES" ]; then
-    if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then
-      echo "All jobs succeeded! PUBLISHING..."
-    else
-      echo "Some jobs failed"
-    fi
-  fi
 - coveralls
-- travis_wait python setup.py prerelease
+- bash <(curl -s https://codecov.io/bash)
 - requires.io update-site -t ac3bbcca32ae03237a6aae2b02eb9411045489bb -r
-- make test
-after_failure:
-- python travis_after_all.py
-- export $(cat .to_export_back)
-- |
-  if [ "$BUILD_LEADER" = "YES" ]; then
-    if [ "$BUILD_AGGREGATE_STATUS" = "others_failed" ]; then
-      echo "All jobs failed"
-    else
-      echo "Some jobs failed"
-    fi
-  fi
-after_script:
-- echo leader=$BUILD_LEADER status=$BUILD_AGGREGATE_STATUS
-branches:
-  only:
-  - master
-  - develop
 notifications:
   email:
   - [email protected]
   - [email protected]
-before_deploy:
-- echo "before deploy..."
 deploy:
 - provider: releases
   api_key:
-    secure: gr9iOcQjdoAyUAim6FWKzJI9MBaJo9XKfGQGu7wdPXUFhg80Rp6GLJsowP+aU94NjXM1UQlVHDAy627WtjBlLH2SvmVEIIr7+UKBopBYuXG5jJ1m3wOZE+4f1Pqe9bqFc1DxgucqE8qF0sC24fIbNM2ToeyYrxrS6RoL2gRrX2I=
-  file: dist/confluence-$PACKAGE_VERSION.tar.gz
+    secure: G19YtkGAX0aJ1oyd/7eRj1KYdsmAkjkfU2UISvsjh/68ec1+9qtPpN7BbkFYZYMjSx0BtS0SEEA7Vdl4F9DI9Zzqahbj7WzDLFe9/4aZKM/ztfKWR6CNAYaMazAKS5W7r9pPkBBDIIJ9zCqvV7FRzjewEpfTwFzwUdY+IpxEsAM=
+  file:
+  - dist/$PACKAGE_NAME-$PACKAGE_VERSION.tar.gz
+  - dist/$PACKAGE_NAME-$PACKAGE_VERSION-py2.py3-none-any.whl
+  - ChangeLog
   skip_cleanup: true
   on:
-    condition: "$BUILD_LEADER = YES"
+    repo: pycontribs/jira
+    tags: true
+    python: 2.7
+    condition: $TOXENV != docs
 - provider: pypi
   user: sorin
   password:
     secure: E0cjANF7SLBdYrsnWLK8X/xWznqkF0JrP/DVfDazPzUYH6ynFeneyofzNJQPLTLsqe1eKXhuUJ/Sbl+RHFB0ySo/j/7NfYd/9pm8hpUkGCvR09IwtvMLgWKp3k10NWab03o2GOkSJSrLvZofyZBGR40wwu2O9uXPCb2rvucCGbw=
   distributions: sdist bdist_wheel
+  skip_cleanup: true
   on:
-    condition: "$BUILD_LEADER = YES"
+    tags: true
+    python: 2.7
+    condition: $TOXENV != docs
     branch: master
 - provider: pypi
   server: https://testpypi.python.org/pypi
   user: sorins
   password:
     secure: E0cjANF7SLBdYrsnWLK8X/xWznqkF0JrP/DVfDazPzUYH6ynFeneyofzNJQPLTLsqe1eKXhuUJ/Sbl+RHFB0ySo/j/7NfYd/9pm8hpUkGCvR09IwtvMLgWKp3k10NWab03o2GOkSJSrLvZofyZBGR40wwu2O9uXPCb2rvucCGbw=
   distributions: sdist bdist_wheel
+  skip_cleanup: true
   on:
-    condition: "$BUILD_LEADER = YES"
+    tags: false
+    python: 2.7
+    condition: $TOXENV != docs
     branch: develop
-after_deploy:
-- echo "Now we only have to increase the version number, tag the changset and push..."
-- "./release.sh"
 env:
-  matrix:
-    secure: fuXwQL+KHQ96XkAFl2uQc8eK8dAjrgkup46tck/UGjVpdv1PT/yHmBKrvpFjDa50ueGbtBwTdKAwhyAmYuiZCk2IYHzdvBylCZBBji2FSpaTM59CVwgkVT6tx3HHO83X0mEX6ih9TJvZD5XhX+YUjopnseRXRq3ey3JZJXWN4RM=
+  global:
+  - secure: fuXwQL+KHQ96XkAFl2uQc8eK8dAjrgkup46tck/UGjVpdv1PT/yHmBKrvpFjDa50ueGbtBwTdKAwhyAmYuiZCk2IYHzdvBylCZBBji2FSpaTM59CVwgkVT6tx3HHO83X0mEX6ih9TJvZD5XhX+YUjopnseRXRq3ey3JZJXWN4RM=
+  - secure: "pGQGM5YmHvOgaKihOyzb3k6bdqLQnZQ2OXO9QrfXlXwtop3zvZQi80Q+01l230x2psDWlwvqWTknAjAt1w463fYXPwpoSvKVCsLSSbjrf2l56nrDqnoir+n0CBy288+eIdaGEfzcxDiuULeKjlg08zrqjcjLjW0bDbBrlTXsb5U="

MANIFEST.in

@@ -1 +1,4 @@
-include README.md
+include LICENSE README.rst
+include requirements.txt
+include requirements-dev.txt
+prune tests

Makefile

@@ -1,11 +1,10 @@
 .PHONY: build test
 
-all: build
+all: test
 
 test:
-	@python3 -m pip install -q -r requirements-dev.txt
-	@python3 -m pytest
+	@python -m pip install -q -r requirements.txt -r requirements-dev.txt
+	@python -m pytest
 
 build: test
 	@python setup.py build
-	@python -m pytest

README.md renamed to README.rst

@@ -1,6 +1,20 @@
 Confluence Python API
 =====================
 
+
+.. image:: https://img.shields.io/pypi/v/confluence.svg
+        :target: https://pypi.python.org/pypi/confluence/
+
+.. image:: https://img.shields.io/pypi/l/confluence.svg
+        :target: https://pypi.python.org/pypi/confluence/
+
+.. image:: https://img.shields.io/pypi/dm/confluence.svg
+        :target: https://pypi.python.org/pypi/confluence/
+
+.. image:: https://img.shields.io/pypi/wheel/confluence.svg
+        :target: https://pypi.python.org/pypi/confluence/
+
+------------
 If you want to interfere with Confluence from Python, this is what you are looking for.
 
 While this library is quite new it has the basic functionality for retrieving and storing pages in Confluence 3.x-5.x, hiding most API differences between these versions.

confluence/__init__.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python
-# Licensed to PSF under a Contributor Agreement.
-# See http://www.python.org/psf/license for licensing details.
-from .package_meta import __version__, __date__, __author__, __copyright__, __email__, __status__
+from pbr.version import VersionInfo
 from .confluence import Confluence
 import sys
 
+_v = VersionInfo('jira').semantic_version()
+__version__ = _v.release_string()
+version_info = _v.version_tuple()
+
 __all__ = ('Confluence', '__version__', '__author__', '__copyright__', '__email__', '__status__', '__date__')
 
 if sys.hexversion < 0x02070000:

confluence/package_meta.py

@@ -4,7 +4,7 @@
 [pytest]
 norecursedirs = . .svn _build tmp* lib/third lib *.egg bin distutils build docs demo
 python_files = *.py
-addopts = -p no:xdist --ignore=setup.py --tb=long -rxX -v --color=yes --maxfail=1 --pep8 --junitxml=build/results.xml --cov-report=xml
+addopts = -s -p no:xdist --ignore=setup.py --tb=long -rxX -v --color=yes --maxfail=1 --pep8 --junitxml=build/results.xml --cov-report=xml
 testpaths = tests
 # --maxfail=2 -n4
 # -n4              runs up to 4 parallel procs

pytest.ini

@@ -0,0 +1,4 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+pbr