Skip to content

Commit 0634a79

Browse files
GrahamDumpletonGrahamDumpleton
committed
Merge branch 'release/1.15.0'
2 parents f2f1a68 + ba845c6 commit 0634a79

27 files changed

+1041
-171
lines changed

‎.github/workflows/main.yml

Lines changed: 81 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os:
13-
- ubuntu-latest
13+
- ubuntu-20.04
1414
python-version:
1515
- 2.7
1616
- 3.5
@@ -19,62 +19,63 @@ jobs:
1919
- 3.8
2020
- 3.9
2121
- "3.10"
22-
- 3.11-dev
22+
- 3.11
23+
- 3.12-dev
2324
- pypy-2.7
24-
- pypy-3.6
25-
- pypy-3.7
25+
- pypy-3.8
26+
- pypy-3.9
2627
steps:
2728
- name: Checkout code
28-
uses: actions/checkout@v1
29+
uses: actions/checkout@v3
2930
- name: Setup Python ${{ matrix.python-version }}
30-
uses: actions/setup-python@v2
31+
uses: actions/setup-python@v4
3132
with:
3233
python-version: ${{ matrix.python-version }}
3334
- name: Update pip
3435
run: python -m pip install -U pip wheel setuptools
3536
- name: Install tox
36-
run: python -m pip install tox tox-gh-actions
37+
run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
3738
- name: Test with tox
3839
run: python -m tox
3940
- name: Store partial coverage reports
40-
uses: actions/upload-artifact@v2
41+
uses: actions/upload-artifact@v3
4142
with:
4243
name: coverage
4344
path: .coverage.*
4445

45-
test_aarch64_linux:
46-
name: Test (${{ matrix.python.os }}, ${{ matrix.python.python-version }}, aarch64)
47-
runs-on: ${{ matrix.python.os }}
48-
strategy:
49-
matrix:
50-
python:
51-
#- {os: ubuntu-latest, python-version: 3.7, pyver: py37}
52-
#- {os: ubuntu-latest, python-version: 3.8, pyver: py38}
53-
#- {os: ubuntu-latest, python-version: 3.9, pyver: py39}
54-
- {os: ubuntu-latest, python-version: "3.10", pyver: py310}
55-
env:
56-
py: python${{ matrix.python.python-version }}
57-
steps:
58-
- name: Checkout
59-
uses: actions/checkout@v2
60-
- name: Set up QEMU
61-
id: qemu
62-
uses: docker/setup-qemu-action@v1
63-
- name: Test with tox
64-
run: |
65-
docker run --rm -v ${{ github.workspace }}:/io:rw --workdir=/io \
66-
arm64v8/ubuntu \
67-
bash -exc 'apt-get update && \
68-
apt install software-properties-common -y && \
69-
add-apt-repository ppa:deadsnakes/ppa -y && \
70-
apt install -y ${{ env.py }} && \
71-
apt install -y ${{ env.py }}-venv && \
72-
${{ env.py }} -m venv .env && \
73-
source .env/bin/activate && \
74-
pip install -U pip wheel setuptools && \
75-
pip install tox tox-gh-actions && \
76-
tox -e ${{ matrix.python.pyver }} && \
77-
deactivate'
46+
# test_aarch64_linux:
47+
# name: Test (${{ matrix.python.os }}, ${{ matrix.python.python-version }}, aarch64)
48+
# runs-on: ${{ matrix.python.os }}
49+
# strategy:
50+
# matrix:
51+
# python:
52+
# #- {os: ubuntu-20.04, python-version: 3.7, pyver: py37}
53+
# #- {os: ubuntu-20.04, python-version: 3.8, pyver: py38}
54+
# #- {os: ubuntu-20.04, python-version: 3.9, pyver: py39}
55+
# - {os: ubuntu-20.04, python-version: "3.10", pyver: py310}
56+
# env:
57+
# py: python${{ matrix.python.python-version }}
58+
# steps:
59+
# - name: Checkout
60+
# uses: actions/checkout@v2
61+
# - name: Set up QEMU
62+
# id: qemu
63+
# uses: docker/setup-qemu-action@v1
64+
# - name: Test with tox
65+
# run: |
66+
# docker run --rm -v ${{ github.workspace }}:/io:rw --workdir=/io \
67+
# arm64v8/ubuntu \
68+
# bash -exc 'apt-get update && \
69+
# apt install software-properties-common -y && \
70+
# add-apt-repository ppa:deadsnakes/ppa -y && \
71+
# apt install -y ${{ env.py }} && \
72+
# apt install -y ${{ env.py }}-venv && \
73+
# ${{ env.py }} -m venv .env && \
74+
# source .env/bin/activate && \
75+
# pip install -U pip wheel setuptools && \
76+
# pip install "tox<4.0.0" "tox-gh-actions<3.0.0" && \
77+
# tox -e ${{ matrix.python.pyver }} && \
78+
# deactivate'
7879

7980
test_macos:
8081
name: Test (${{ matrix.os }}, ${{ matrix.python-version }})
@@ -91,25 +92,25 @@ jobs:
9192
- 3.8
9293
- 3.9
9394
- "3.10"
94-
- 3.11-dev
95+
- 3.11
9596
- pypy-2.7
96-
#- pypy-3.6
97-
- pypy-3.7
97+
- pypy-3.8
98+
- pypy-3.9
9899
steps:
99100
- name: Checkout code
100-
uses: actions/checkout@v1
101+
uses: actions/checkout@v3
101102
- name: Setup Python ${{ matrix.python-version }}
102-
uses: actions/setup-python@v2
103+
uses: actions/setup-python@v4
103104
with:
104105
python-version: ${{ matrix.python-version }}
105106
- name: Update pip
106107
run: python -m pip install -U pip wheel setuptools
107108
- name: Install tox
108-
run: python -m pip install tox tox-gh-actions
109+
run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
109110
- name: Test with tox
110111
run: python -m tox
111112
- name: Store partial coverage reports
112-
uses: actions/upload-artifact@v2
113+
uses: actions/upload-artifact@v3
113114
with:
114115
name: coverage
115116
path: .coverage.*
@@ -125,15 +126,15 @@ jobs:
125126
- 2.7
126127
steps:
127128
- name: Checkout code
128-
uses: actions/checkout@v1
129+
uses: actions/checkout@v3
129130
- name: Setup Python ${{ matrix.python-version }}
130-
uses: actions/setup-python@v2
131+
uses: actions/setup-python@v4
131132
with:
132133
python-version: ${{ matrix.python-version }}
133134
- name: Update pip
134135
run: python -m pip install -U pip wheel setuptools
135136
- name: Install tox
136-
run: python -m pip install tox tox-gh-actions
137+
run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
137138
- name: Test with tox
138139
run: python -m tox -e py27,py27-without-extensions
139140

@@ -151,21 +152,21 @@ jobs:
151152
- 3.8
152153
- 3.9
153154
- "3.10"
154-
- 3.11-dev
155+
- 3.11
155156
- pypy-2.7
156-
- pypy-3.6
157-
- pypy-3.7
157+
- pypy-3.8
158+
- pypy-3.9
158159
steps:
159160
- name: Checkout code
160-
uses: actions/checkout@v1
161+
uses: actions/checkout@v3
161162
- name: Setup Python ${{ matrix.python-version }}
162-
uses: actions/setup-python@v2
163+
uses: actions/setup-python@v4
163164
with:
164165
python-version: ${{ matrix.python-version }}
165166
- name: Update pip
166167
run: python -m pip install -U pip wheel setuptools
167168
- name: Install tox
168-
run: python -m pip install tox tox-gh-actions
169+
run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
169170
- name: Test with tox
170171
run: python -m tox
171172

@@ -175,20 +176,24 @@ jobs:
175176
- test_linux
176177
- test_macos
177178
- test_windows
178-
runs-on: ubuntu-latest
179+
runs-on: ubuntu-20.04
179180
steps:
180181
- name: Checkout code
181-
uses: actions/checkout@v2
182+
uses: actions/checkout@v3
182183
with:
183184
submodules: true
184185
- name: Set up Python 3.9
185-
uses: actions/setup-python@v2
186+
uses: actions/setup-python@v4
186187
with:
187188
python-version: 3.9
188-
- name: Build source distribution
189+
- name: Build full source distribution as tar.gz
189190
run: python setup.py sdist
191+
- name: Install the wheel package
192+
run: pip install wheel
193+
- name: Build pure Python source wheel
194+
run: WRAPT_INSTALL_EXTENSIONS=false python setup.py bdist_wheel
190195
- name: Store built wheels
191-
uses: actions/upload-artifact@v2
196+
uses: actions/upload-artifact@v3
192197
with:
193198
name: dist
194199
path: dist/*
@@ -203,9 +208,9 @@ jobs:
203208
runs-on: ${{ matrix.os }}
204209
strategy:
205210
matrix:
206-
os: [ubuntu-latest, windows-latest, macos-latest]
211+
os: [ubuntu-20.04, windows-latest, macos-latest]
207212
steps:
208-
- uses: actions/checkout@v2
213+
- uses: actions/checkout@v3
209214
- name: Build wheels
210215
uses: pypa/[email protected]
211216
with:
@@ -215,7 +220,7 @@ jobs:
215220
CIBW_BUILD: cp27* cp35*
216221
CIBW_SKIP: cp27-win*
217222
CIBW_BUILD_VERBOSITY: 1
218-
- uses: actions/upload-artifact@v2
223+
- uses: actions/upload-artifact@v3
219224
with:
220225
name: dist
221226
path: dist/*.whl
@@ -224,35 +229,35 @@ jobs:
224229
name: Build wheels (3.6+) on ${{ matrix.os }} for ${{ matrix.arch }}
225230
needs:
226231
- test_linux
227-
- test_aarch64_linux
232+
#- test_aarch64_linux
228233
- test_macos
229234
- test_windows_py27
230235
- test_windows
231236
runs-on: ${{ matrix.os }}
232237
strategy:
233238
matrix:
234-
os: [ubuntu-latest, windows-latest, macos-latest]
239+
os: [ubuntu-20.04, windows-latest, macos-latest]
235240
arch: [auto]
236241
include:
237-
- os: ubuntu-latest
242+
- os: ubuntu-20.04
238243
arch: aarch64
239244
- os: macos-latest
240245
arch: arm64
241246
steps:
242-
- uses: actions/checkout@v2
247+
- uses: actions/checkout@v3
243248
- name: Set up QEMU
244249
if: ${{ matrix.arch == 'aarch64' }}
245-
uses: docker/setup-qemu-action@v1
250+
uses: docker/setup-qemu-action@v2
246251
- name: Build wheels
247-
uses: pypa/cibuildwheel@v2.4.0
252+
uses: pypa/cibuildwheel@v2.11.4
248253
with:
249254
output-dir: dist
250255
env:
251256
WRAPT_INSTALL_EXTENSIONS: true
252257
CIBW_SKIP: pp*
253258
CIBW_BUILD_VERBOSITY: 1
254259
CIBW_ARCHS: ${{ matrix.arch }}
255-
- uses: actions/upload-artifact@v2
260+
- uses: actions/upload-artifact@v3
256261
with:
257262
name: dist
258263
path: dist/*.whl
@@ -265,18 +270,18 @@ jobs:
265270
- test_macos
266271
- test_windows_py27
267272
- test_windows
268-
runs-on: ubuntu-latest
273+
runs-on: ubuntu-20.04
269274
steps:
270275
- name: Checkout code
271-
uses: actions/checkout@v1
276+
uses: actions/checkout@v3
272277
- name: Setup Python 3.9
273-
uses: actions/setup-python@v2
278+
uses: actions/setup-python@v4
274279
with:
275280
python-version: 3.9
276281
- name: Install coverage package
277282
run: python -m pip install -U coverage
278283
- name: Download partial coverage reports
279-
uses: actions/download-artifact@v2
284+
uses: actions/download-artifact@v3
280285
with:
281286
name: coverage
282287
- name: Combine coverage

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013-2022, Graham Dumpleton
1+
Copyright (c) 2013-2023, Graham Dumpleton
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ package :
1111
release : clean package
1212
twine upload dist/*
1313

14-
clean :
15-
rm -rf build dist wrapt.egg-info
14+
mostlyclean:
15+
rm -rf .coverage.*
16+
17+
clean: mostlyclean
18+
rm -rf build dist src/wrapt.egg-info .tox
1619

1720
test :
1821
tox --skip-missing-interpreters

0 commit comments

Comments
 (0)