Skip to content
This repository has been archived by the owner on Aug 27, 2023. It is now read-only.

Commit

Permalink
Use bumpversion for managing version numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
stevearc committed Mar 10, 2014
1 parent ad3541b commit 93f4499
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 560 deletions.
6 changes: 6 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[bumpversion]
current_version = 0.1.1
tag_name = {new_version}
files = setup.py doc/conf.py flywheel/__init__.py
commit = True
tag = True
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ nosetests.xml
.pydevproject
flywheel_env
.ropeproject
_version.py
_localhost.db

# docs
Expand Down
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include flywheel_version.py
include CHANGES.rst
include README.rst
recursive-exclude tests *
13 changes: 5 additions & 8 deletions doc/conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
""" Sphinx conf """
""" Sphinx conf. """
import sys
import importlib
import inspect
Expand All @@ -16,8 +16,6 @@
for path in addtl_paths:
sys.path.insert(0, os.path.abspath(os.path.join(docs_basepath, path)))

from flywheel_version import git_version_data

extensions = ['sphinx.ext.autodoc', 'numpydoc', 'sphinx.ext.intersphinx',
'sphinx.ext.linkcode', 'sphinx.ext.autosummary', 'github']

Expand All @@ -26,9 +24,8 @@
copyright = u'2013, Steven Arcangeli'
github_user = u'mathcamp'

version_data = git_version_data()
version = version_data['tag']
release = version_data['version']
release = '0.1.1'
version = '.'.join(release.split('.')[:2])

exclude_patterns = ['_build']
pygments_style = 'sphinx'
Expand All @@ -42,7 +39,7 @@


def linkcode_resolve(domain, info):
""" Link source code to github """
""" Link source code to github. """
if domain != 'py' or not info['module']:
return None
filename = info['module'].replace('.', '/')
Expand All @@ -59,4 +56,4 @@ def linkcode_resolve(domain, info):
except (TypeError, IOError):
pass
return ("https://github.com/%s/%s/blob/%s/%s.py%s" %
(github_user, project, version_data['ref'], filename, lineno))
(github_user, project, release, filename, lineno))
32 changes: 2 additions & 30 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Flywheel - Object Mapper for DynamoDB
Flywheel is a library for mapping python objects to DynamoDB tables. It uses a
SQLAlchemy-like syntax for queries.

Code lives here: https://github.com/mathcamp/flywheel

User Guide
----------

Expand All @@ -16,36 +18,6 @@ User Guide
topics/crud
topics/develop

Versions
--------
========= =============== ========
Version Build Coverage
========= =============== ========
master_ |build-master|_ |coverage-master|_
0.1.0_ |build-0.1.0|_ |coverage-0.1.0|_
0.1.1_ |build-0.1.1|_ |coverage-0.1.1|_
========= =============== ========

.. _master: ../latest/
.. |build-master| image:: https://travis-ci.org/mathcamp/flywheel.png?branch=master
.. _build-master: https://travis-ci.org/mathcamp/flywheel
.. |coverage-master| image:: https://coveralls.io/repos/mathcamp/flywheel/badge.png?branch=master
.. _coverage-master: https://coveralls.io/r/mathcamp/flywheel?branch=master

.. _0.1.0: ../0.1.0/
.. |build-0.1.0| image:: https://travis-ci.org/mathcamp/flywheel.png?branch=0.1.0
.. _build-0.1.0: https://travis-ci.org/mathcamp/flywheel
.. |coverage-0.1.0| image:: https://coveralls.io/repos/mathcamp/flywheel/badge.png?branch=0.1.0
.. _coverage-0.1.0: https://coveralls.io/r/mathcamp/flywheel?branch=0.1.0

.. _0.1.1: ../0.1.1/
.. |build-0.1.1| image:: https://travis-ci.org/mathcamp/flywheel.png?branch=0.1.1
.. _build-0.1.1: https://travis-ci.org/mathcamp/flywheel
.. |coverage-0.1.1| image:: https://coveralls.io/repos/mathcamp/flywheel/badge.png?branch=0.1.1
.. _coverage-0.1.1: https://coveralls.io/r/mathcamp/flywheel?branch=0.1.1

Code lives here: https://github.com/mathcamp/flywheel

API Reference
-------------
.. toctree::
Expand Down
5 changes: 1 addition & 4 deletions flywheel/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
""" flywheel """
try:
from ._version import __version__ # pylint: disable=F0401
except ImportError: # pragma: no cover
__version__ = 'unknown'
__version__ = '0.1.1'

import boto.dynamodb.types
from boto.dynamodb2.exceptions import ConditionalCheckFailedException
Expand Down
Loading

0 comments on commit 93f4499

Please sign in to comment.