diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 0000000..bdd9876 --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,16 @@ +[bumpversion] +current_version = 0.1.4 +commit = True +tag = True + +[bumpversion:file:setup.py] + +[bumpversion:file:src/jaydebeapi/dbapi2.py] +serialize = {major}, {minor}, {patch} +parse = (?P\d+), (?P\d+), (?P\d+) + +[bumpversion:file:README.rst] +search = - Next version - unreleased +replace = - Next version - unreleased + - {new_version} - {now:%Y-%m-%d} + diff --git a/README.rst b/README.rst index 909e82d..f6c08ec 100644 --- a/README.rst +++ b/README.rst @@ -152,7 +152,9 @@ distribution for details. Changelog ========= -- 0.1.5 - To be released +- Next version - unreleased + + - Add version number to module. - Host project source code at github. diff --git a/README_development.rst b/README_development.rst index f52dce3..ad299d8 100644 --- a/README_development.rst +++ b/README_development.rst @@ -11,45 +11,30 @@ Build a new release 1. Sync the branch. :: - $ bzr pull + $ git checkout master + $ git pull 2. Do your changes. -3. Assert the right connect method is configured for tests. +3. Add a changelog entry to ``README.rst`` below ``Next version``. -4. Run test suite. Once for cPython, once for Jython and ideally - against all accessible databases. :: +4. Commit and push your changes. :: - $ nosetests + $ git commit -m "my comment" + $ git push -4. Add a changelog entry to ``README.rst``. +5. Wait for travis CI build to finish successfully. -5. Increase version in ``setup.py``. +6. Bump version :: -6. Run setuptools to ensure everything is working as expected. :: + $ bumpversion [major|minor|patch] - $ python setup.py sdist --formats=gztar +7. Run setuptools to ensure everything is working as expected. :: -7. Check the file createt by sdist for unwanted or missing files. + $ python setup.py sdist bdist_wheel upload -8. Install the sdist in a fresh virtualenv. :: +8. Check the files in ``dist/`` for unwanted or missing files. - $ virtualenv tmp - $ . tmp/bin/activate - $ easy_install path_to_build_folder/jaydebeapi-0.x.tar.gz +9. Send new version and tags to github origin. :: -6. Commit your changes. :: - - $ bzr ci -m "my comment" - -7. Tag for the new version. :: - - $ bzr tag jaydebeapi-PUT-VERSION-HERE - -8. Send changes to launchpad. :: - - $ bzr push - -9. Publish new release on PyPi. :: - - $ python setup.py sdist --formats=gztar upload + $ git push origin master --tags diff --git a/dev-requirements.txt b/dev-requirements.txt index c9ebbb2..70e1c5e 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1 +1,2 @@ +wheel==0.24.0 bumpversion==0.5.1 diff --git a/src/jaydebeapi/dbapi2.py b/src/jaydebeapi/dbapi2.py index 26a1991..e7d33c7 100644 --- a/src/jaydebeapi/dbapi2.py +++ b/src/jaydebeapi/dbapi2.py @@ -17,6 +17,9 @@ # License along with JayDeBeApi. If not, see # . +__version_info__ = (0, 1, 4) +__version__ = ".".join(__version_info__) + import datetime import exceptions import glob