p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert setuptools_scm addition introduced with f22d14b105

This commit is contained in:
holger krekel 2015-09-17 12:58:04 +02:00
parent f978b545c5
commit 7eb1211192
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -19,9 +19,6 @@ include/
.eggs/ .eggs/
# this file is managed by setuptools_scm
_pytest/__init__.py
doc/*/_build doc/*/_build
build/ build/
dist/ dist/
@ -35,4 +32,3 @@ env/
.coverage .coverage
.ropeproject .ropeproject
.idea .idea

2
_pytest/__init__.py Normal file
View File

@ -0,0 +1,2 @@
#
__version__ = '2.8.0.dev5'

7
_pytest/genscript.py
View File

@ -31,12 +31,7 @@ def pkg_to_mapping(name):
else: # package else: # package
for pyfile in toplevel.visit('*.py'): for pyfile in toplevel.visit('*.py'):
pkg = pkgname(name, toplevel, pyfile) pkg = pkgname(name, toplevel, pyfile)
if pkg == '_pytest.__init__': name2src[pkg] = pyfile.read()
# remove the coding comment line to avoid python bug
lines = pyfile.read().splitlines(True)
name2src[pkg] = ''.join(lines[1:])
else:
name2src[pkg] = pyfile.read()
# with wheels py source code might be not be installed # with wheels py source code might be not be installed
# and the resulting genscript is useless, just bail out. # and the resulting genscript is useless, just bail out.
assert name2src, "no source code found for %r at %r" %(name, toplevel) assert name2src, "no source code found for %r at %r" %(name, toplevel)

2
pytest.py
View File

@ -22,7 +22,7 @@ from _pytest.config import (
main, UsageError, _preloadplugins, cmdline, main, UsageError, _preloadplugins, cmdline,
hookspec, hookimpl hookspec, hookimpl
) )
from _pytest import version as __version__ from _pytest import __version__
_preloadplugins() # to populate pytest.* namespace so help(pytest) works _preloadplugins() # to populate pytest.* namespace so help(pytest) works

3
setup.py
View File

@ -63,7 +63,7 @@ def main():
name='pytest', name='pytest',
description='pytest: simple powerful testing with Python', description='pytest: simple powerful testing with Python',
long_description=long_description, long_description=long_description,
use_scm_version={'write_to': '_pytest/__init__.py'}, version=get_version(),
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@ -75,7 +75,6 @@ def main():
# the following should be enabled for release # the following should be enabled for release
install_requires=install_requires, install_requires=install_requires,
extras_require=extras_require, extras_require=extras_require,
setup_requires=['setuptools_scm'],
packages=['_pytest', '_pytest.assertion', '_pytest.vendored_packages'], packages=['_pytest', '_pytest.assertion', '_pytest.vendored_packages'],
py_modules=['pytest'], py_modules=['pytest'],
zip_safe=False, zip_safe=False,