From eebdf56d4fe62c8aeb07d771f212d809a43e0598 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 3 Dec 2015 16:29:08 +1100 Subject: [PATCH] Update to use setuptools_scm for release version generation To support openstack-infra we store the release version in git tags and use setuptools_scm to extract that tag in the setup file when generating sdist and wheel files. This patch includes the use of the new xstatic-release tool which handles the majority of management of metadata to support the infra release process. Change-Id: I14e0b5986d3433afd796ea44e66dfafd5003e732 --- .gitignore | 3 ++- MANIFEST.in | 4 +--- README.txt | 5 ++++ setup.cfg | 20 ++++++++++++++++ setup.py | 28 ++++------------------- xstatic/pkg/angular_bootstrap/__init__.py | 2 +- 6 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 setup.cfg diff --git a/.gitignore b/.gitignore index b3085b8..a1af9cc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ *.egg-info .venv .tox -build dist +.eggs +MANIFEST diff --git a/MANIFEST.in b/MANIFEST.in index dfee431..af3cdd3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,6 @@ include README.txt -recursive-include xstatic/pkg/angular_bootstrap * - +recursive-include xstatic * global-exclude *.pyc global-exclude *.pyo global-exclude *.orig global-exclude *.rej - diff --git a/README.txt b/README.txt index db5b55a..8f44db8 100644 --- a/README.txt +++ b/README.txt @@ -11,3 +11,8 @@ the XStatic base package, if you like. You can find more info about the xstatic packaging way in the package `XStatic`. + +Maintenance +----------- + +To release this package you must use the xstatic-release tool. diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..3473853 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,20 @@ +[metadata] +name = XStatic-Angular-Bootstrap +summary = Angular-Bootstrap 0.11.0 (XStatic packaging standard) +description-file = README.rst +maintainer = Maxime Vidori +maintainer-email = maxime.vidori@enovance.com +home-page = http://angular-ui.github.io/bootstrap/ +keywords = angular_bootstrap xstatic +license = (same as Angular-Bootstrap) +zip_safe = False +namespace_packages = + xstatic + xstatic.pkg + +[files] +packages = + xstatic + +[bdist_wheel] +universal = True diff --git a/setup.py b/setup.py index 5458a9e..b680c15 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,7 @@ -from xstatic.pkg import angular_bootstrap as xs - -# The README.txt file should be written in reST so that PyPI can use -# it to generate your project's PyPI page. -long_description = open('README.txt').read() - from setuptools import setup, find_packages - setup( - name=xs.PACKAGE_NAME, - version=xs.PACKAGE_VERSION, - description=xs.DESCRIPTION, - long_description=long_description, - classifiers=xs.CLASSIFIERS, - keywords=xs.KEYWORDS, - maintainer=xs.MAINTAINER, - maintainer_email=xs.MAINTAINER_EMAIL, - license=xs.LICENSE, - url=xs.HOMEPAGE, - platforms=xs.PLATFORMS, - packages=find_packages(), - namespace_packages=['xstatic', 'xstatic.pkg', ], - include_package_data=True, - zip_safe=False, - install_requires=[], # nothing! :) - # if you like, you MAY use the 'XStatic' package. + name='XStatic-Angular-Bootstrap', + use_scm_version=True, + setup_requires=['setuptools_scm', 'wheel'], + packages=find_packages() ) diff --git a/xstatic/pkg/angular_bootstrap/__init__.py b/xstatic/pkg/angular_bootstrap/__init__.py index 5a6fe2c..b8b04e7 100644 --- a/xstatic/pkg/angular_bootstrap/__init__.py +++ b/xstatic/pkg/angular_bootstrap/__init__.py @@ -13,7 +13,7 @@ NAME = __name__.split('.')[-1] # package name (e.g. 'foo' or 'foo_bar') VERSION = '0.11.0' # version of the packaged files, please use the upstream # version number -BUILD = '3' # our package build number, so we can release new builds +BUILD = '4' # our package build number, so we can release new builds # with fixes for xstatic stuff. PACKAGE_VERSION = VERSION + '.' + BUILD # version used for PyPi