revert setuptools_scm addition introduced with f22d14b105
This commit is contained in:
parent
f978b545c5
commit
7eb1211192
|
@ -19,9 +19,6 @@ include/
|
|||
|
||||
.eggs/
|
||||
|
||||
# this file is managed by setuptools_scm
|
||||
_pytest/__init__.py
|
||||
|
||||
doc/*/_build
|
||||
build/
|
||||
dist/
|
||||
|
@ -35,4 +32,3 @@ env/
|
|||
.coverage
|
||||
.ropeproject
|
||||
.idea
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
#
|
||||
__version__ = '2.8.0.dev5'
|
|
@ -31,12 +31,7 @@ def pkg_to_mapping(name):
|
|||
else: # package
|
||||
for pyfile in toplevel.visit('*.py'):
|
||||
pkg = pkgname(name, toplevel, pyfile)
|
||||
if pkg == '_pytest.__init__':
|
||||
# remove the coding comment line to avoid python bug
|
||||
lines = pyfile.read().splitlines(True)
|
||||
name2src[pkg] = ''.join(lines[1:])
|
||||
else:
|
||||
name2src[pkg] = pyfile.read()
|
||||
name2src[pkg] = pyfile.read()
|
||||
# with wheels py source code might be not be installed
|
||||
# and the resulting genscript is useless, just bail out.
|
||||
assert name2src, "no source code found for %r at %r" %(name, toplevel)
|
||||
|
|
|
@ -22,7 +22,7 @@ from _pytest.config import (
|
|||
main, UsageError, _preloadplugins, cmdline,
|
||||
hookspec, hookimpl
|
||||
)
|
||||
from _pytest import version as __version__
|
||||
from _pytest import __version__
|
||||
|
||||
_preloadplugins() # to populate pytest.* namespace so help(pytest) works
|
||||
|
||||
|
|
3
setup.py
3
setup.py
|
@ -63,7 +63,7 @@ def main():
|
|||
name='pytest',
|
||||
description='pytest: simple powerful testing with Python',
|
||||
long_description=long_description,
|
||||
use_scm_version={'write_to': '_pytest/__init__.py'},
|
||||
version=get_version(),
|
||||
url='http://pytest.org',
|
||||
license='MIT license',
|
||||
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
||||
|
@ -75,7 +75,6 @@ def main():
|
|||
# the following should be enabled for release
|
||||
install_requires=install_requires,
|
||||
extras_require=extras_require,
|
||||
setup_requires=['setuptools_scm'],
|
||||
packages=['_pytest', '_pytest.assertion', '_pytest.vendored_packages'],
|
||||
py_modules=['pytest'],
|
||||
zip_safe=False,
|
||||
|
|
Loading…
Reference in New Issue