Skip to content

Commit

Permalink
Add __version__ attr to pycassa module, use for setup.py, conf.py
Browse files Browse the repository at this point in the history
  • Loading branch information
thobbs committed Sep 4, 2012
1 parent 4771d12 commit 402d4d1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
6 changes: 4 additions & 2 deletions doc/conf.py
Expand Up @@ -8,6 +8,8 @@
import os
sys.path.append(os.path.abspath('..'))

import pycassa

# -- General configuration -----------------------------------------------------

# Add any Sphinx extension module names here, as strings. They can be extensions
Expand All @@ -31,9 +33,9 @@
# built documents.
#
# The short X.Y version.
version = '1.7'
version = pycassa.__version__
# The full version, including alpha/beta/rc tags.
release = '1.7.0'
release = pycassa.__version__

# List of documents that shouldn't be included in the build.
unused_docs = []
Expand Down
3 changes: 3 additions & 0 deletions pycassa/__init__.py
Expand Up @@ -9,3 +9,6 @@
NotFoundException, UnavailableException, TimedOutException

from pycassa.logging.pycassa_logger import *

__version_info__ = (1, 7, 0)
__version__ = '.'.join(map(str, __version_info__))
10 changes: 4 additions & 6 deletions setup.py
Expand Up @@ -22,9 +22,7 @@
from distutils.core import setup

from distutils.cmd import Command

version_tuple = (1, 7, 0)
__version__ = '.'.join(map(str, version_tuple))
import pycassa

long_description = """pycassa is a python client library for Apache Cassandra with the following features:
Expand Down Expand Up @@ -83,7 +81,7 @@ def run(self):
path = "doc/_build/doctest"
mode = "doctest"
else:
path = "doc/_build/%s" % __version__
path = "doc/_build/%s" % pycassa.__version__
mode = "html"

try:
Expand All @@ -110,15 +108,15 @@ def run(self):

setup(
name = 'pycassa',
version = __version__,
version = pycassa.__version__,
author = 'Jonathan Hseu',
author_email = 'vomjom AT vomjom.net',
maintainer = 'Tyler Hobbs',
maintainer_email = 'pycassa.maintainer@gmail.com',
description = 'Python client library for Apache Cassandra',
long_description = long_description,
url = 'http://github.com/pycassa/pycassa',
download_url = 'http://github.com/downloads/pycassa/pycassa/pycassa-%s.tar.gz' % __version__,
download_url = 'http://github.com/downloads/pycassa/pycassa/pycassa-%s.tar.gz' % pycassa.__version__,
keywords = 'cassandra client db distributed thrift',
packages = ['pycassa',
'pycassa.cassandra',
Expand Down

0 comments on commit 402d4d1

Please sign in to comment.