From 4f972c003996ce09c4ab9f2c784e22b9f867216c Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Tue, 1 Mar 2016 10:36:10 +0100 Subject: [PATCH] Revert of the revert of the python package with version information This reverts commit bee8f16dbbbe1db4137bfaae3bdcdfb537361875. --- docs/release.rst | 3 ++- pybind11/__init__.py | 1 + pybind11/_version.py | 2 ++ setup.py | 5 ++--- 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 pybind11/__init__.py create mode 100644 pybind11/_version.py diff --git a/docs/release.rst b/docs/release.rst index b03870419..2296225b1 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -1,11 +1,12 @@ To release a new version of pybind11: - Update version macros in `include/pybind11/common.h` -- Update version in `setup.py` +- Update `pybind11/_version.py` (set release version, remove 'dev') - `git add` and `git commit`. - `python setup.py sdist upload`. - `python setup.py bdist_wheel upload`. - `git tag -a X.X -m 'Release tag comment'`. +- Update `_version.py` (add 'dev' and increment minor). - `git add` and `git commit`. `git push`. `git push --tags`. The remote for the last `git push --tags` should be the main repository for diff --git a/pybind11/__init__.py b/pybind11/__init__.py new file mode 100644 index 000000000..4f1853b77 --- /dev/null +++ b/pybind11/__init__.py @@ -0,0 +1 @@ +from ._version import version_info, __version__ diff --git a/pybind11/_version.py b/pybind11/_version.py new file mode 100644 index 000000000..6e1c20f94 --- /dev/null +++ b/pybind11/_version.py @@ -0,0 +1,2 @@ +version_info = (1, 3, 'dev0') +__version__ = '.'.join(map(str, version_info)) diff --git a/setup.py b/setup.py index 3d910a76a..d8c598726 100644 --- a/setup.py +++ b/setup.py @@ -3,8 +3,7 @@ # Setup script for PyPI; use CMakeFile.txt to build the example application from setuptools import setup - -__version__ = '1.3' +from pybind11 import __version__ setup( name='pybind11', @@ -14,7 +13,7 @@ setup( author_email='wenzel@inf.ethz.ch', url='https://github.com/wjakob/pybind11', download_url='https://github.com/wjakob/pybind11/tarball/v' + __version__, - packages=[], + packages=['pybind11'], license='BSD', headers=[ 'include/pybind11/attr.h',