Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
ZODB
Commits
1c9a55d4
Commit
1c9a55d4
authored
Aug 22, 2018
by
Jason Madden
Committed by
GitHub
Aug 22, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #219 from zopefoundation/issue218
Remove support for 'python setup.py test'. [skip ci]
parents
3019c476
3577a9c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
68 deletions
+5
-68
CHANGES.rst
CHANGES.rst
+4
-0
setup.py
setup.py
+0
-58
tox.ini
tox.ini
+1
-10
No files found.
CHANGES.rst
View file @
1c9a55d4
...
...
@@ -5,6 +5,10 @@
5.5.0 (unreleased)
==================
- Remove support for ``python setup.py test``. It hadn't been working
for some time. See `issue #218
<https://github.com/zopefoundation/ZODB/issues/218>`_.
- Bump the dependency on zodbpickle to at least 1.0.1. This is
required to avoid a memory leak on Python 2.7. See `issue 203
<https://github.com/zopefoundation/ZODB/issues/203>`_.
...
...
setup.py
View file @
1c9a55d4
...
...
@@ -11,7 +11,6 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
import
os
from
setuptools
import
setup
,
find_packages
version
=
'5.5.0.dev0'
...
...
@@ -35,62 +34,6 @@ Operating System :: Unix
Framework :: ZODB
"""
def
_modname
(
path
,
base
,
name
=
''
):
if
path
==
base
:
return
name
dirname
,
basename
=
os
.
path
.
split
(
path
)
return
_modname
(
dirname
,
base
,
basename
+
'.'
+
name
)
def
_flatten
(
suite
,
predicate
=
lambda
*
x
:
True
):
from
unittest
import
TestCase
for
suite_or_case
in
suite
:
if
predicate
(
suite_or_case
):
if
isinstance
(
suite_or_case
,
TestCase
):
yield
suite_or_case
else
:
for
x
in
_flatten
(
suite_or_case
):
yield
x
def
_no_layer
(
suite_or_case
):
return
getattr
(
suite_or_case
,
'layer'
,
None
)
is
None
def
_unittests_only
(
suite
,
mod_suite
):
for
case
in
_flatten
(
mod_suite
,
_no_layer
):
suite
.
addTest
(
case
)
def
alltests
():
import
logging
import
pkg_resources
import
unittest
# Something wacked in setting recursion limit when running setup test
import
ZODB.FileStorage.tests
del
ZODB
.
FileStorage
.
tests
.
_save_index
class
NullHandler
(
logging
.
Handler
):
level
=
50
def
emit
(
self
,
record
):
pass
logging
.
getLogger
().
addHandler
(
NullHandler
())
suite
=
unittest
.
TestSuite
()
base
=
pkg_resources
.
working_set
.
find
(
pkg_resources
.
Requirement
.
parse
(
'ZODB'
)).
location
for
dirpath
,
_dirnames
,
filenames
in
os
.
walk
(
base
):
if
os
.
path
.
basename
(
dirpath
)
==
'tests'
:
for
filename
in
filenames
:
if
filename
.
endswith
(
'.py'
)
and
filename
.
startswith
(
'test'
):
mod
=
__import__
(
_modname
(
dirpath
,
base
,
os
.
path
.
splitext
(
filename
)[
0
]),
{},
{},
[
'*'
])
_unittests_only
(
suite
,
mod
.
test_suite
())
elif
'tests.py'
in
filenames
:
mod
=
__import__
(
_modname
(
dirpath
,
base
,
'tests'
),
{},
{},
[
'*'
])
_unittests_only
(
suite
,
mod
.
test_suite
())
return
suite
def
read
(
path
):
with
open
(
path
)
as
f
:
return
f
.
read
()
...
...
@@ -119,7 +62,6 @@ setup(
classifiers
=
list
(
filter
(
None
,
classifiers
.
split
(
"
\
n
"
))),
description
=
long_description
.
split
(
'
\
n
'
,
2
)[
1
],
long_description
=
long_description
,
test_suite
=
"__main__.alltests"
,
# to support "setup.py test"
tests_require
=
tests_require
,
extras_require
=
{
'test'
:
tests_require
,
...
...
tox.ini
View file @
1c9a55d4
...
...
@@ -2,7 +2,7 @@
# Jython 2.7rc2 does work, but unfortunately has an issue running
# with Tox 1.9.2 (http://bugs.jython.org/issue2325)
#envlist = py26,py27,py33,py34,pypy,simple,jython,pypy3
envlist
=
py27,py34,py35,py36,pypy,
simple,
pypy3
envlist
=
py27,py34,py35,py36,pypy,pypy3
[testenv]
# ZODB.tests.testdocumentation needs to find
...
...
@@ -20,15 +20,6 @@ commands =
deps
=
.
[test]
[testenv:simple]
# Test that 'setup.py test' works
basepython
=
python2.7
commands
=
python
setup.py
test
-q
deps
=
{[testenv]deps}
[testenv:coverage]
basepython
=
python2.7
commands
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment