diff options
| author | Ned Batchelder <nedbat@gmail.com> | 2018-01-14 22:35:10 +0000 |
|---|---|---|
| committer | Ned Batchelder <nedbat@gmail.com> | 2018-01-14 22:35:10 +0000 |
| commit | 18946e70b3b6292c72a920bca4e1cf8c9ff3ad93 (patch) | |
| tree | 4dd3c7de63ba655c096c0dc429a97cc1932295f1 | |
| parent | 27afd523228582351f6a5ec671da4ee64fa4453b (diff) | |
| parent | 4e2fcb2979a97808f22295673d19b2752f540894 (diff) | |
| download | python-coveragepy-18946e70b3b6292c72a920bca4e1cf8c9ff3ad93.tar.gz | |
Merged in jdufresne/coverage.py (pull request #136)
Pass python_requires argument to setuptools
| -rw-r--r-- | coverage/execfile.py | 2 | ||||
| -rw-r--r-- | tests/test_arcs.py | 2 | ||||
| -rw-r--r-- | tests/test_process.py | 2 | ||||
| -rw-r--r-- | tox.ini | 9 |
4 files changed, 11 insertions, 4 deletions
diff --git a/coverage/execfile.py b/coverage/execfile.py index ffe3ca1..42e0d96 100644 --- a/coverage/execfile.py +++ b/coverage/execfile.py @@ -255,7 +255,7 @@ def make_code_from_pyc(filename): raise NoCode("Bad magic number in .pyc file") date_based = True - if sys.version_info >= (3, 7): + if sys.version_info >= (3, 7, 0, 'alpha', 4): flags = struct.unpack('<L', fpyc.read(4))[0] hash_based = flags & 0x01 if hash_based: diff --git a/tests/test_arcs.py b/tests/test_arcs.py index 2111c9b..ef71ea1 100644 --- a/tests/test_arcs.py +++ b/tests/test_arcs.py @@ -1123,7 +1123,7 @@ class OptimizedIfTest(CoverageTest): arcz=".1 12 24 41 26 61 1.", ) # Before 3.7, no Python optimized away "if not __debug__:" - if env.PYVERSION < (3, 7): + if env.PYVERSION < (3, 7, 0, 'alpha', 4): arcz = ".1 12 23 31 34 41 26 61 1." arcz_missing = "34 41" else: diff --git a/tests/test_process.py b/tests/test_process.py index b173c01..8bf6c11 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -705,6 +705,8 @@ class EnvironmentTest(CoverageTest): self.assert_tryexecfile_output(out_cov, out_py) def test_coverage_run_dir_is_like_python_dir(self): + if sys.version_info == (3, 5, 4, 'final', 0): + self.skipTest("3.5.4 broke this: https://bugs.python.org/issue32551") with open(TRY_EXECFILE) as f: self.make_file("with_main/__main__.py", f.read()) @@ -21,9 +21,14 @@ deps = #-e/Users/ned/unittest_mixins py26: unittest2==1.1.0 # gevent won't install on py37: https://github.com/gevent/gevent/issues/1019 + # greenlet needs cython pre-installed. + py37: cython + py37: git+https://github.com/gevent/gevent.git@debb8d838500849a0726bb0a8d94ed8d2541396d#egg=gevent==0.0 + py37: git+https://github.com/python-greenlet/greenlet.git@780a12b51fcef9adcc4f2c9a4cc5b05c2d652ba4#egg=greenlet==0.0 py{27,33,34,35,36}: gevent==1.2.2 - py{26,27,33,34,35,36,37}: eventlet==0.21.0 - py{26,27,33,34,35,36,37}: greenlet==0.4.12 + py26: eventlet==0.21.0 + py{27,33,34,35,36,37}: eventlet==0.22.0 + py{26,27,33,34,35,36}: greenlet==0.4.12 # Windows can't update the pip version with pip running, so use Python # to install things. |