summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-05 00:12:26 -0400
committerChris McDonough <chrism@plope.com>2010-11-05 00:12:26 -0400
commit9643ebe5666cfba5b5a9e8a8efd2ce2a8c9b3b72 (patch)
tree0772e302f8e9c417a852449ed232999b296df5b7
parentfb30035ec15d56ac93362160e08f0ffbbfdd1212 (diff)
downloadpyramid-9643ebe5666cfba5b5a9e8a8efd2ce2a8c9b3b72.tar.gz
pyramid-9643ebe5666cfba5b5a9e8a8efd2ce2a8c9b3b72.tar.bz2
pyramid-9643ebe5666cfba5b5a9e8a8efd2ce2a8c9b3b72.zip
get rid of a dependency on pkginfo
-rw-r--r--docs/conf.py6
-rw-r--r--setup.py3
2 files changed, 2 insertions, 7 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 69c6b0680..f78f09dcc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -37,10 +37,6 @@ for item in os.listdir(parent):
if item.endswith('.egg'):
sys.path.append(os.path.join(parent, item))
-import pkginfo
-
-pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__),'..'))
-
# General configuration
# ---------------------
@@ -66,7 +62,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
# other places throughout the built documents.
#
# The short X.Y version.
-version = pkg_info.version
+version = '0.0'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 820c622f1..eac0dc051 100644
--- a/setup.py
+++ b/setup.py
@@ -48,8 +48,7 @@ if platform.system() == 'Java':
tests_require = install_requires + ['twill']
else:
tests_require= install_requires + ['Sphinx', 'docutils', 'coverage',
- 'twill', 'repoze.sphinx.autointerface',
- 'pkginfo']
+ 'twill', 'repoze.sphinx.autointerface']
if sys.version_info[:2] < (2, 6):
install_requires.append('simplejson')