Skip to content

Commit 0785570

Browse files
authored
Merge pull request #117 from nicoddemus/github-actions
2 parents a28ae79 + e24a036 commit 0785570

19 files changed

+187
-287
lines changed

.github/workflows/main.yml

Lines changed: 71 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,83 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
python: ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
14-
os: [ubuntu-latest, windows-latest]
13+
name: [
14+
"windows-py27",
15+
"windows-py35",
16+
"windows-py36",
17+
"windows-py37",
18+
"windows-py38",
19+
"windows-py39",
20+
21+
"linux-py27",
22+
"linux-py35",
23+
"linux-py36",
24+
"linux-py37",
25+
"linux-py38",
26+
"linux-py39",
27+
28+
"linux-pypy2",
29+
"linux-pypy3",
30+
]
1531
include:
16-
- python: "2.7"
32+
- name: "windows-py27"
33+
python: "2.7"
1734
tox_env: "py27"
18-
- python: "3.4"
19-
tox_env: "py34"
20-
- python: "3.5"
35+
os: "windows-latest"
36+
- name: "windows-py35"
37+
python: "3.5"
2138
tox_env: "py35"
22-
- python: "3.6"
39+
os: "windows-latest"
40+
- name: "windows-py36"
41+
python: "3.6"
2342
tox_env: "py36"
24-
- python: "3.7"
43+
os: "windows-latest"
44+
- name: "windows-py37"
45+
python: "3.7"
2546
tox_env: "py37"
26-
- python: "3.8"
47+
os: "windows-latest"
48+
- name: "windows-py38"
49+
python: "3.8"
2750
tox_env: "py38"
28-
- python: "3.9"
51+
os: "windows-latest"
52+
- name: "windows-py39"
53+
python: "3.9"
2954
tox_env: "py39"
55+
os: "windows-latest"
56+
57+
- name: "linux-py27"
58+
python: "2.7"
59+
tox_env: "py27"
60+
os: "ubuntu-latest"
61+
- name: "linux-py35"
62+
python: "3.5"
63+
tox_env: "py35"
64+
os: "ubuntu-latest"
65+
- name: "linux-py36"
66+
python: "3.6"
67+
tox_env: "py36"
68+
os: "ubuntu-latest"
69+
- name: "linux-py37"
70+
python: "3.7"
71+
tox_env: "py37"
72+
os: "ubuntu-latest"
73+
- name: "linux-py38"
74+
python: "3.8"
75+
tox_env: "py38"
76+
os: "ubuntu-latest"
77+
- name: "linux-py39"
78+
python: "3.9"
79+
tox_env: "py39"
80+
os: "ubuntu-latest"
81+
82+
- name: "linux-pypy2"
83+
python: "pypy-2.7"
84+
tox_env: "pypy2"
85+
os: "ubuntu-latest"
86+
- name: "linux-pypy3"
87+
python: "pypy-3.7"
88+
tox_env: "pypy3"
89+
os: "ubuntu-latest"
3090

3191
steps:
3292
- uses: actions/checkout@v1
@@ -42,31 +102,13 @@ jobs:
42102
run: |
43103
tox -e ${{ matrix.tox_env }}
44104
45-
linting:
46-
47-
runs-on: ubuntu-latest
48-
49-
steps:
50-
- uses: actions/checkout@v1
51-
- name: Set up Python
52-
uses: actions/setup-python@v1
53-
with:
54-
python-version: "3.7"
55-
- name: Install tox
56-
run: |
57-
python -m pip install --upgrade pip
58-
pip install tox
59-
- name: Linting
60-
run: |
61-
tox -e linting
62-
63105
deploy:
64106

65107
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
66108

67109
runs-on: ubuntu-latest
68110

69-
needs: [build, linting]
111+
needs: build
70112

71113
steps:
72114
- uses: actions/checkout@v1

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
exclude: doc/en/example/py2py3/test_py2.py
22
repos:
33
- repo: https://github.com/python/black
4-
rev: 19.3b0
4+
rev: 20.8b1
55
hooks:
66
- id: black
77
args: [--safe, --quiet]
88
- repo: https://github.com/asottile/blacken-docs
9-
rev: v1.0.0
9+
rev: v1.9.2
1010
hooks:
1111
- id: blacken-docs
1212
additional_dependencies: [black==19.3b0]
1313
- repo: https://github.com/pre-commit/pre-commit-hooks
14-
rev: v2.2.3
14+
rev: v3.4.0
1515
hooks:
1616
- id: trailing-whitespace
1717
- id: end-of-file-fixer
1818
- id: fix-encoding-pragma
1919
- id: check-yaml
2020
- repo: https://github.com/asottile/reorder_python_imports
21-
rev: v1.4.0
21+
rev: v2.3.6
2222
hooks:
2323
- id: reorder-python-imports
2424
args: ['--application-directories=execnet']

.travis.yml

Lines changed: 0 additions & 79 deletions
This file was deleted.

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.8.0 (UNRELEASED)
2+
------------------
3+
4+
* Dropped support for Python 3.4.
5+
6+
17
1.7.1 (2019-08-28)
28
------------------
39

README.rst

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ of the pytest-xdist plugin. Do not use in new projects.**
1616
.. image:: https://img.shields.io/pypi/pyversions/execnet.svg
1717
:target: https://pypi.org/project/execnet/
1818

19-
.. image:: https://travis-ci.org/pytest-dev/execnet.svg?branch=master
20-
:target: https://travis-ci.org/pytest-dev/execnet
21-
22-
.. image:: https://ci.appveyor.com/api/projects/status/n9qy8df16my4gds9/branch/master?svg=true
23-
:target: https://ci.appveyor.com/project/pytestbot/execnet
19+
.. image:: https://github.com/pytest-dev/execnet/workflows/build/badge.svg
20+
:target: https://github.com/pytest-dev/execnet/actions?query=workflow%3Abuild
2421

2522
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
2623
:target: https://github.com/python/black
@@ -47,9 +44,6 @@ Features
4744

4845
* grouped creation and robust termination of processes
4946

50-
* well tested between CPython 2.7, 3.4+, Jython 2.5.1 and PyPy 2.2
51-
interpreters.
52-
5347
* interoperable between Windows and Unix-ish systems.
5448

5549
* integrates with different threading models, including standard

appveyor.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

doc/example/sysinfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def parsehosts(path):
4141
for line in path.readlines():
4242
m = rex.match(line)
4343
if m is not None:
44-
sshname, = m.groups()
44+
(sshname,) = m.groups()
4545
l.append(sshname)
4646
return l
4747

execnet/deprecated.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99

1010
def PopenGateway(python=None):
11-
""" instantiate a gateway to a subprocess
12-
started with the given 'python' executable.
11+
"""instantiate a gateway to a subprocess
12+
started with the given 'python' executable.
1313
"""
1414
APIWARN("1.0.0b4", "use makegateway('popen')")
1515
spec = execnet.XSpec("popen")
@@ -18,22 +18,22 @@ def PopenGateway(python=None):
1818

1919

2020
def SocketGateway(host, port):
21-
""" This Gateway provides interaction with a remote process
22-
by connecting to a specified socket. On the remote
23-
side you need to manually start a small script
24-
(py/execnet/script/socketserver.py) that accepts
25-
SocketGateway connections or use the experimental
26-
new_remote() method on existing gateways.
21+
"""This Gateway provides interaction with a remote process
22+
by connecting to a specified socket. On the remote
23+
side you need to manually start a small script
24+
(py/execnet/script/socketserver.py) that accepts
25+
SocketGateway connections or use the experimental
26+
new_remote() method on existing gateways.
2727
"""
2828
APIWARN("1.0.0b4", "use makegateway('socket=host:port')")
2929
spec = execnet.XSpec("socket={}:{}".format(host, port))
3030
return execnet.default_group.makegateway(spec)
3131

3232

3333
def SshGateway(sshaddress, remotepython=None, ssh_config=None):
34-
""" instantiate a remote ssh process with the
35-
given 'sshaddress' and remotepython version.
36-
you may specify an ssh_config file.
34+
"""instantiate a remote ssh process with the
35+
given 'sshaddress' and remotepython version.
36+
you may specify an ssh_config file.
3737
"""
3838
APIWARN("1.0.0b4", "use makegateway('ssh=host')")
3939
spec = execnet.XSpec("ssh=%s" % sshaddress)

execnet/gateway.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __repr__(self):
4242
)
4343

4444
def exit(self):
45-
""" trigger gateway exit. Defer waiting for finishing
45+
"""trigger gateway exit. Defer waiting for finishing
4646
of receiver-thread and subprocess activity to when
4747
group.terminate() is called.
4848
"""
@@ -93,20 +93,20 @@ def remote_status(self):
9393
return RemoteStatus(statusdict)
9494

9595
def remote_exec(self, source, **kwargs):
96-
""" return channel object and connect it to a remote
97-
execution thread where the given ``source`` executes.
98-
99-
* ``source`` is a string: execute source string remotely
100-
with a ``channel`` put into the global namespace.
101-
* ``source`` is a pure function: serialize source and
102-
call function with ``**kwargs``, adding a
103-
``channel`` object to the keyword arguments.
104-
* ``source`` is a pure module: execute source of module
105-
with a ``channel`` in its global namespace
106-
107-
In all cases the binding ``__name__='__channelexec__'``
108-
will be available in the global namespace of the remotely
109-
executing code.
96+
"""return channel object and connect it to a remote
97+
execution thread where the given ``source`` executes.
98+
99+
* ``source`` is a string: execute source string remotely
100+
with a ``channel`` put into the global namespace.
101+
* ``source`` is a pure function: serialize source and
102+
call function with ``**kwargs``, adding a
103+
``channel`` object to the keyword arguments.
104+
* ``source`` is a pure module: execute source of module
105+
with a ``channel`` in its global namespace
106+
107+
In all cases the binding ``__name__='__channelexec__'``
108+
will be available in the global namespace of the remotely
109+
executing code.
110110
"""
111111
call_name = None
112112
file_name = None

0 commit comments

Comments
 (0)