From b5982a5472720f001fe52f0defc2c2d804d3501e Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 15 Feb 2016 04:59:44 -0500 Subject: [PATCH 1/7] Learning from lessons in the keyring 8.4 release (https://github.com/jaraco/keyring/issues/210), always clean the build artifacts before cutting a release. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 445263a..8004dcb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [aliases] -release = sdist bdist_wheel build_sphinx upload upload_docs +release = clean --all sdist bdist_wheel build_sphinx upload upload_docs test = pytest [wheel] From 65b649869bb4f0ab1aad5deb3a30973a45082d4a Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 5 Mar 2016 08:56:02 -0500 Subject: [PATCH 2/7] Derive description, url, and namespace_packages from name --- setup.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index e6edf34..e825a5d 100644 --- a/setup.py +++ b/setup.py @@ -17,16 +17,20 @@ sphinx = ['sphinx'] if needs_sphinx else [] needs_wheel = {'release', 'bdist_wheel'}.intersection(sys.argv) wheel = ['wheel'] if needs_wheel else [] +name = 'skeleton' +description = '' + setup_params = dict( - name='skeleton', + name=name, use_scm_version=True, author="Jason R. Coombs", author_email="jaraco@jaraco.com", - description="skeleton", + description=description or name, long_description=long_description, - url="https://github.com/jaraco/skeleton", + url="https://github.com/jaraco/" + name, packages=setuptools.find_packages(), include_package_data=True, + namespace_packages=name.split('.')[:-1], install_requires=[ ], extras_require={ From 752b1096b8d126df040847c19c82aa042ccfe77a Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 2 Apr 2016 21:46:39 -0400 Subject: [PATCH 3/7] Add PyPI deployment --- .travis.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e5e969..a5b29ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,18 @@ sudo: false language: python python: - - 2.7 - - 3.5 +- 2.7 +- 3.5 script: - - pip install -U pytest - - python setup.py test +- pip install -U pytest +- python setup.py test +deploy: + provider: pypi + on: + tags: true + all_branches: true + user: jaraco + provider: pypi + # supply password with `travis encrypt --add deploy.password` + distributions: release + python: 3.5 From 58f71d1e2bad2392cde6cfabef4fc9cfc8bfec28 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 2 Apr 2016 22:03:05 -0400 Subject: [PATCH 4/7] Remove duplicate provider line --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5b29ee..7ff32e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ deploy: tags: true all_branches: true user: jaraco - provider: pypi # supply password with `travis encrypt --add deploy.password` distributions: release python: 3.5 From 01e953bac9ac132fba90550492ee9f7eedfce7e0 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 2 Apr 2016 22:23:15 -0400 Subject: [PATCH 5/7] Add support for linking to issues and adding datestamps to changelog entries. --- docs/conf.py | 20 ++++++++++++++++++++ docs/history.rst | 2 +- setup.py | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 1874074..9c7ad1b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,6 +5,7 @@ import setuptools_scm extensions = [ 'sphinx.ext.autodoc', + 'rst.linker', ] # General information about the project. @@ -17,3 +18,22 @@ version = setuptools_scm.get_version(root='..', relative_to=__file__) release = version master_doc = 'index' + +link_files = { + 'CHANGES.rst': dict( + using=dict( + GH='https://github.com', + project=project, + ), + replace=[ + dict( + pattern=r"(Issue )?#(?P\d+)", + url='{GH}/jaraco/{project}/issues/{issue}', + ), + dict( + pattern=r"^(?m)((?Pv?\d+(\.\d+){1,2}))\n[-=]+\n", + with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n", + ), + ], + ), +} diff --git a/docs/history.rst b/docs/history.rst index 907000b..8e21750 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -5,4 +5,4 @@ History ******* -.. include:: ../CHANGES.rst +.. include:: ../CHANGES (links).rst diff --git a/setup.py b/setup.py index e825a5d..99d6c9c 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ with io.open('README.rst', encoding='utf-8') as readme: needs_pytest = {'pytest', 'test'}.intersection(sys.argv) pytest_runner = ['pytest_runner'] if needs_pytest else [] needs_sphinx = {'release', 'build_sphinx', 'upload_docs'}.intersection(sys.argv) -sphinx = ['sphinx'] if needs_sphinx else [] +sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else [] needs_wheel = {'release', 'bdist_wheel'}.intersection(sys.argv) wheel = ['wheel'] if needs_wheel else [] From 04528bdf294e0b9eb4920d4b4a8637b6871b1606 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 16 Apr 2016 15:22:52 +0100 Subject: [PATCH 6/7] Move Python 3.5 condition to 'on' section --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ff32e9..c5f3495 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ deploy: on: tags: true all_branches: true + python: 3.5 user: jaraco # supply password with `travis encrypt --add deploy.password` distributions: release - python: 3.5 From 29d9ebee0154e77e416162061752833410e98cbd Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 29 Apr 2016 09:32:33 -0400 Subject: [PATCH 7/7] Update comment to reflect the Github-backed skeleton model (preferred to the generation library-backed model). --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 99d6c9c..91e4110 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Generated by jaraco.develop 2.27.1 -# https://pypi.python.org/pypi/jaraco.develop + +# Project skeleton maintained at https://github.com/jaraco/skeleton import io import sys