summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Rouse <jr@its.to>2017-04-28 21:35:33 -0700
committerGitHub <noreply@github.com>2017-04-28 21:35:33 -0700
commit494089c48316890f4c9fc19b92db4ef4b5f8baea (patch)
treea6e509b5159c1795c35136f31370fbc9f01b6ff8
parent859eac40ac7d0b5f3260068c4810d027012f0488 (diff)
parentb0262da2a2dc2654b61842325652d31b77b2af30 (diff)
downloadappdirs-494089c48316890f4c9fc19b92db4ef4b5f8baea.tar.gz
Merge pull request #92 from leorochael/leorochael-no-import-of-appdirs-during-setup
Don't import appdirs from setup.py
-rw-r--r--appdirs.py4
-rw-r--r--setup.py11
2 files changed, 11 insertions, 4 deletions
diff --git a/appdirs.py b/appdirs.py
index ae67001..808a2ab 100644
--- a/appdirs.py
+++ b/appdirs.py
@@ -13,8 +13,8 @@ See <http://github.com/ActiveState/appdirs> for details and usage.
# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-__version_info__ = (1, 4, 3)
-__version__ = '.'.join(map(str, __version_info__))
+__version__ = "1.4.3"
+__version_info__ = tuple(int(segment) for segment in __version__.split("."))
import sys
diff --git a/setup.py b/setup.py
index 69c46bb..e118896 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ try:
from setuptools import setup
except ImportError:
from distutils.core import setup
-import appdirs
+import ast
tests_require = []
if sys.version_info < (2, 7):
@@ -21,9 +21,16 @@ def read(fname):
return out
+# Do not import `appdirs` yet, lest we import some random version on sys.path.
+for line in read("appdirs.py").splitlines():
+ if line.startswith("__version__"):
+ version = ast.literal_eval(line.split("=", 1)[1].strip())
+ break
+
+
setup(
name='appdirs',
- version=appdirs.__version__,
+ version=version,
description='A small Python module for determining appropriate ' + \
'platform-specific dirs, e.g. a "user data dir".',
long_description=read('README.rst') + '\n' + read('CHANGES.rst'),