Skip to content

Commit 0616f1e

Browse files
revert the automated version gathering
1 parent 98b901c commit 0616f1e

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

CHANGELOG

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.4
2+
-----------------
3+
4+
- revert the automated version gathering
5+
6+
17
1.3
28
----------------------------------------
39

apipkg.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
from types import ModuleType
1111

1212

13+
__version__ = '1.4.dev1'
14+
15+
1316
def _py_abspath(path):
1417
"""
1518
special version of abspath
@@ -34,10 +37,6 @@ def distribution_version(name):
3437
return dist.version
3538

3639

37-
# this will yield wrong data for vendore versions
38-
__version__ = distribution_version(__name__)
39-
40-
4140
def initpkg(pkgname, exportdefs, attr=dict(), eager=False):
4241
""" initialize given package from the export definitions. """
4342
oldmod = sys.modules.get(pkgname)
@@ -48,8 +47,6 @@ def initpkg(pkgname, exportdefs, attr=dict(), eager=False):
4847
d['__file__'] = f
4948
if hasattr(oldmod, '__version__'):
5049
d['__version__'] = oldmod.__version__
51-
elif distribution_version(pkgname) is not None:
52-
d['__version__'] = distribution_version(pkgname)
5350
if hasattr(oldmod, '__loader__'):
5451
d['__loader__'] = oldmod.__loader__
5552
if hasattr(oldmod, '__path__'):
@@ -140,6 +137,7 @@ def __makeattr(self, name):
140137
if '__onfirstaccess__' in self.__map__:
141138
target = self.__map__.pop('__onfirstaccess__')
142139
importobj(*target)()
140+
if '__name__'
143141
try:
144142
modpath, attrname = self.__map__[name]
145143
except KeyError:

setup.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
66
(c) 2009 holger krekel, Holger Krekel
77
"""
8-
8+
import re
99
from setuptools import setup
1010

11+
def get_version():
12+
VERSION_RE = re.compile("__version__ = \'(.*)\'", re.M)
13+
with open('apipkg.py') as fp:
14+
return VERSION_RE.search(fp.read()).group(1)
1115

1216
def main():
1317
setup(
1418
name='apipkg',
1519
description='apipkg: namespace control and lazy-import mechanism',
1620
long_description=open('README.txt').read(),
17-
get_version_from_scm=True,
21+
version=get_version(),
1822
url='http://bitbucket.org/hpk42/apipkg',
1923
license='MIT License',
2024
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@@ -30,9 +34,6 @@ def main():
3034
'Topic :: Software Development :: Libraries',
3135
'Programming Language :: Python'],
3236
py_modules=['apipkg'],
33-
setup_requires=[
34-
'hgdistver'
35-
]
3637
)
3738

3839
if __name__ == '__main__':

0 commit comments

Comments
 (0)