Skip to content

Commit ec471cf

Browse files
authored
subprocess.Popen().wait() at the end of stdout collection... Fix #64 (#66)
* subprocess.Popen().wait() at the end of stdout collection... Fix #64 Limit supported python to < 3.5 (v2.0+ for 3.5+) Reduce CI jobs and packages amount on PyPI Requirements ad PEP0508 only (standard is not young) * enforce bump
1 parent 3f37c4e commit ec471cf

File tree

9 files changed

+14
-53
lines changed

9 files changed

+14
-53
lines changed

.travis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ sudo: false
22
language: python
33
os: linux
44
python:
5-
- 2.7
5+
- &main_python 2.7
66
- 3.4
7-
- 3.5
8-
- 3.6
9-
- &mainstream_python 3.7-dev
107
- &pypy pypy
11-
- pypy3.5
128
install:
139
- &upgrade_python_toolset pip install --upgrade pip setuptools wheel
1410
- pip install tox-travis
@@ -21,7 +17,7 @@ jobs:
2117
fast_finish: true
2218
include:
2319
- stage: Static analisys
24-
python: 3.6
20+
python: 3.4
2521
services: []
2622
install:
2723
- *upgrade_python_toolset
@@ -31,7 +27,7 @@ jobs:
3127
after_success: skip
3228

3329
- stage: Code style check
34-
python: *mainstream_python
30+
python: 3.4
3531
install:
3632
- *upgrade_python_toolset
3733
- pip install tox

CI_REQUIREMENTS.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
mock # no assert_called_once in py35
2-
futures>=3.1; python_version == "2.7"
3-
enum34>=1.1; python_version == "2.7"
42
-r requirements.txt

README.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,9 @@ Pros:
4444

4545
Python 2.7
4646
Python 3.4
47-
Python 3.5
48-
Python 3.6
49-
Python 3.7
5047
PyPy
51-
PyPy3 3.5+
48+
49+
.. note:: Update to version 2.0+ for usage with python 3.5+. This version is for legacy python and no new features are planned.
5250

5351
This package includes:
5452

exec_helpers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
'ExecResult',
4949
)
5050

51-
__version__ = '1.3.6'
51+
__version__ = '1.3.7'
5252
__author__ = "Alexey Stepanov"
5353
__author_email__ = 'penguinolog@gmail.com'
5454
__maintainers__ = {

exec_helpers/subprocess_runner.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ def poll_stdout():
135135
log=logger,
136136
verbose=verbose
137137
)
138+
interface.wait() # wait for the end of execution
138139

139140
@threaded.threadpooled
140141
def poll_stderr():

requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ six>=1.10.0 # MIT
44
threaded>=1.0 # Apache-2.0
55
PyYAML>=3.12 # MIT
66
advanced-descriptors>=1.0 # Apache-2.0
7-
typing >= 3.6 ; python_version < "3.8"
7+
typing >= 3.6 # PSF
8+
futures>=3.1; python_version == "2.7"
9+
enum34>=1.1; python_version == "2.7"

setup.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,6 @@ def get_simple_vars_from_src(src):
238238
'Programming Language :: Python :: 2.7',
239239
'Programming Language :: Python :: 3',
240240
'Programming Language :: Python :: 3.4',
241-
'Programming Language :: Python :: 3.5',
242-
'Programming Language :: Python :: 3.6',
243-
'Programming Language :: Python :: 3.7',
244241

245242
'Programming Language :: Python :: Implementation :: CPython',
246243
'Programming Language :: Python :: Implementation :: PyPy',
@@ -267,7 +264,7 @@ def get_simple_vars_from_src(src):
267264
long_description=long_description,
268265
classifiers=classifiers,
269266
keywords=keywords,
270-
python_requires='>=2.7.5,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
267+
python_requires='>=2.7.5,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,<3.5',
271268
# While setuptools cannot deal with pre-installed incompatible versions,
272269
# setting a lower bound is not harmful - it makes error messages cleaner. DO
273270
# NOT set an upper bound on setuptools, as that will lead to uninstallable
@@ -277,12 +274,6 @@ def get_simple_vars_from_src(src):
277274
setup_requires="setuptools >= 21.0.0,!=24.0.0,"
278275
"!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,"
279276
"!=36.2.0",
280-
extras_require={
281-
':python_version == "2.7"': [
282-
'futures>=1.0',
283-
'enum34>=1.1'
284-
],
285-
},
286277
install_requires=required,
287278
package_data={
288279
str('exec_helpers'): [

tools/build-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m"
2+
PYTHON_VERSIONS="cp34-cp34m"
33

44
# Avoid creation of __pycache__/*.py[c|o]
55
export PYTHONDONTWRITEBYTECODE=1

tox.ini

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
[tox]
77
minversion = 2.0
8-
envlist = pep8, pep257, py{27,34,35,36,37,py,py3}, pylint, bandit, py{34,35,36,37}-nocov, mypy, docs
8+
envlist = pep8, pep257, py{27,34,py}, pylint, bandit, py34-nocov, mypy, docs
99
skipsdist = True
1010
skip_missing_interpreters = True
1111

@@ -20,7 +20,7 @@ deps =
2020
pytest-cov
2121
pytest-html
2222
pytest-sugar
23-
py{27,34,35,36}-nocov: Cython
23+
py34-nocov: Cython
2424
-r{toxinidir}/CI_REQUIREMENTS.txt
2525
py{27,py}: mock
2626

@@ -36,38 +36,13 @@ commands =
3636
pip install exec_helpers --no-index -f dist
3737
py.test -vvv {posargs:test}
3838

39-
[testenv:py35-nocov]
40-
usedevelop = False
41-
commands =
42-
python setup.py bdist_wheel
43-
pip install exec_helpers --no-index -f dist
44-
py.test -vvv {posargs:test}
45-
46-
[testenv:py36-nocov]
47-
usedevelop = False
48-
commands =
49-
python setup.py bdist_wheel
50-
pip install exec_helpers --no-index -f dist
51-
py.test -vvv {posargs:test}
52-
53-
[testenv:py37-nocov]
54-
usedevelop = False
55-
commands =
56-
python setup.py bdist_wheel
57-
pip install exec_helpers --no-index -f dist
58-
py.test -vvv {posargs:test}
59-
6039
[testenv:venv]
6140
commands = {posargs:}
6241

6342
[tox:travis]
6443
2.7 = install, py27,
6544
3.4 = py34,
66-
3.5 = py35,
67-
3.6 = py36,
68-
3.7 = py37,
6945
pypy = install, pypy,
70-
pypy3 = install, pypy3,
7146

7247
[testenv:pep8]
7348
deps =

0 commit comments

Comments
 (0)