Skip to content

Commit 44358ed

Browse files
RonnyPfannschmidtRonnyPfannschmidt
authored
Merge pull request #163 from pytest-dev/ronny/port-hatch
port to hatch
2 parents 92d2772 + 16e6f51 commit 44358ed

File tree

7 files changed

+79
-150
lines changed

7 files changed

+79
-150
lines changed

‎.github/workflows/main.yml

Lines changed: 11 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -3,126 +3,45 @@ name: build
33
on: [push, pull_request]
44

55
jobs:
6-
build:
6+
tests:
77

88
runs-on: ${{ matrix.os }}
99

1010
strategy:
1111
fail-fast: false
1212
matrix:
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-
]
31-
include:
32-
- name: "windows-py27"
33-
python: "2.7"
34-
tox_env: "py27"
35-
os: "windows-latest"
36-
- name: "windows-py35"
37-
python: "3.5"
38-
tox_env: "py35"
39-
os: "windows-latest"
40-
- name: "windows-py36"
41-
python: "3.6"
42-
tox_env: "py36"
43-
os: "windows-latest"
44-
- name: "windows-py37"
45-
python: "3.7"
46-
tox_env: "py37"
47-
os: "windows-latest"
48-
- name: "windows-py38"
49-
python: "3.8"
50-
tox_env: "py38"
51-
os: "windows-latest"
52-
- name: "windows-py39"
53-
python: "3.9"
54-
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"
13+
os: [windows-latest, ubuntu-latest]
14+
python: ["3.7","3.8","3.10","3.11", "pypy-3.7"]
9015

9116
steps:
9217
- uses: actions/checkout@v1
9318
- name: Set up Python
9419
uses: actions/setup-python@v2
9520
with:
9621
python-version: ${{ matrix.python }}
97-
- name: Install tox setuptools_scm
98-
run: |
99-
python -m pip install --upgrade pip
100-
pip install tox setuptools_scm
22+
- name: Install tox
23+
run: pip install tox
10124
- name: Test
102-
run: |
103-
tox -e ${{ matrix.tox_env }}
25+
run: tox -e py
10426

10527
deploy:
10628

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

10931
runs-on: ubuntu-latest
11032

111-
needs: build
33+
needs: tests
11234

11335
steps:
11436
- uses: actions/checkout@v1
11537
- name: Set up Python
116-
uses: actions/setup-python@v1
38+
uses: actions/setup-python@v2
11739
with:
11840
python-version: "3.7"
119-
- name: Install wheel
120-
run: |
121-
python -m pip install --upgrade pip
122-
pip install wheel
41+
- name: Install hatch
42+
run: pip install hatch
12343
- name: Build package
124-
run: |
125-
python setup.py sdist bdist_wheel
44+
run: hatch build
12645
- name: Publish package to PyPI
12746
uses: pypa/gh-action-pypi-publish@master
12847
with:

‎CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2.0.0 (unreleased)
2+
------------------
3+
4+
* removed support for Python < 3.7
5+
* migrate packaging to hatch
6+
17
1.9.0 (2021-06-13)
28
------------------
39

‎doc/support.rst

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@ are welcome to:
77
* join `execnet-dev`_ for general discussions
88
* join `execnet-commit`_ to be notified of changes
99
* clone the `github repository`_ and submit patches
10-
* hang out on the #pytest channel `on irc.libera.chat
11-
<ircs://irc.libera.chat:6697/#pytest>`_ (using an IRC client, `via webchat
12-
<https://web.libera.chat/#pytest>`_, or `via Matrix
13-
<https://matrix.to/#/%23pytest:libera.chat>`_).
14-
* follow the `tetamap blog`_ or `Holger's twitter presence`_.
15-
* contact merlinux_ if you want to buy teaching or other support.
10+
* hang out on the #pytest channel on `irc.libera.chat <ircs://irc.libera.chat/#pytest>`_
11+
(using an IRC client, via `webchat <https://web.libera.chat/#pytest>`_,
12+
or `via Matrix <https://matrix.to/#/%23pytest:libera.chat>`_).
1613

17-
.. _`Holger's twitter presence`: http://twitter.com/hpk42
18-
.. _merlinux: http://merlinux.eu
19-
.. _`tetamap blog`: http://holgerkrekel.net
2014
.. _`execnet-dev`: http://mail.python.org/mailman/listinfo/execnet-dev
2115
.. _`execnet-commit`: http://mail.python.org/mailman/listinfo/execnet-commit
2216
.. _`github repository`: https://github.com/pytest-dev/execnet

‎pyproject.toml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
[build-system]
2+
requires = [
3+
"hatchling",
4+
"hatch-vcs",
5+
]
6+
build-backend = "hatchling.build"
7+
8+
[project]
9+
name = "execnet"
10+
dynamic = ["version"]
11+
description = "execnet: rapid multi-Python deployment"
12+
long_description_file = "README.rst"
13+
license = "MIT"
14+
requires-python = ">=3.7"
15+
authors = [
16+
{ name = "holger krekel and others" },
17+
]
18+
classifiers = [
19+
"Development Status :: 5 - Production/Stable",
20+
"Intended Audience :: Developers",
21+
"License :: OSI Approved :: MIT License",
22+
"Operating System :: MacOS :: MacOS X",
23+
"Operating System :: Microsoft :: Windows",
24+
"Operating System :: POSIX",
25+
"Programming Language :: Python :: 3.7",
26+
"Programming Language :: Python :: 3.8",
27+
"Programming Language :: Python :: 3.9",
28+
"Programming Language :: Python :: 3.10",
29+
"Programming Language :: Python :: 3.11",
30+
"Programming Language :: Python :: Implementation :: CPython",
31+
"Programming Language :: Python :: Implementation :: PyPy",
32+
"Topic :: Software Development :: Libraries",
33+
"Topic :: System :: Distributed Computing",
34+
"Topic :: System :: Networking",
35+
]
36+
37+
[project.optional-dependencies]
38+
testing = [
39+
"pre-commit",
40+
"pytest",
41+
"tox",
42+
"hatch",
43+
]
44+
45+
[project.urls]
46+
Homepage = "https://execnet.readthedocs.io/en/latest/"
47+
48+
[tool.hatch.version]
49+
source = "vcs"
50+
51+
[tool.hatch.build.hooks.vcs]
52+
version-file = "execnet/_version.py"
53+
54+
[tool.hatch.build.targets.sdist]
55+
include = [
56+
"/execnet",
57+
]

‎setup.cfg

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

‎setup.py

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

‎tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
2-
envlist=py27,py37,docs,linting
3-
2+
envlist=py{37,38,39,310,311},docs,linting
3+
isolated_build = true
44
[testenv]
55
deps=
66
setuptools_scm

0 commit comments

Comments
 (0)