Skip to content

Commit ad607fc

Browse files
committed
chore: change to ubuntu-22 since u-20 is deprecated on github
-ensure working pip on python2.7 -delete 3.6 test matrix and support, due to github not supporting python3.6 on ubuntu-22 -deprecate testing on python 2.6
1 parent 2a6593d commit ad607fc

File tree

2 files changed

+13
-83
lines changed

2 files changed

+13
-83
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,35 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- name: py2.6
18-
os: ubuntu-latest
19-
container: centos:6
20-
python-version: 2.6
2117
- name: py3.10 with ossl3.0
2218
os: ubuntu-latest
2319
container: ubuntu:22.04
2420
python-version: "3.10"
2521
tox-env: py310
2622
- name: py2.7
27-
os: ubuntu-20.04
23+
os: ubuntu-22.04
2824
python-version: 2.7
2925
tox-env: py27
3026
- name: py2.7 with old gmpy
31-
os: ubuntu-20.04
27+
os: ubuntu-22.04
3228
python-version: 2.7
3329
tox-env: py27_old_gmpy
3430
- name: py2.7 with old gmpy2
35-
os: ubuntu-20.04
31+
os: ubuntu-22.04
3632
python-version: 2.7
3733
tox-env: py27_old_gmpy2
3834
- name: py2.7 with old six
39-
os: ubuntu-20.04
35+
os: ubuntu-22.04
4036
python-version: 2.7
4137
tox-env: py27_old_six
4238
- name: py2.7 with gmpy
43-
os: ubuntu-20.04
39+
os: ubuntu-22.04
4440
python-version: 2.7
4541
tox-env: gmpypy27
4642
- name: py2.7 with gmpy2
47-
os: ubuntu-20.04
43+
os: ubuntu-22.04
4844
python-version: 2.7
4945
tox-env: gmpy2py27
50-
- name: py3.6
51-
os: ubuntu-20.04
52-
python-version: 3.6
53-
tox-env: py36
5446
- name: py3.7
5547
os: ubuntu-22.04
5648
python-version: 3.7
@@ -97,7 +89,7 @@ jobs:
9789
tox-env: pypy3
9890
# special configurations
9991
- name: py2.7 with instrumental
100-
os: ubuntu-20.04
92+
os: ubuntu-22.04
10193
python-version: 2.7
10294
opt-deps: ['instrumental']
10395
- name: code checks
@@ -178,10 +170,11 @@ jobs:
178170
run: |
179171
sudo apt-get update
180172
sudo apt-get install -y \
181-
python2.7 python2.7-dev python-pip-whl
173+
python2.7 python2.7-dev
174+
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
182175
sudo ln -sf python2.7 /usr/bin/python
183-
export PYTHONPATH=`echo /usr/share/python-wheels/pip-*py2*.whl`
184-
sudo --preserve-env=PYTHONPATH python -m pip install --upgrade pip setuptools wheel
176+
sudo python get-pip.py
177+
sudo pip install --upgrade setuptools wheel
185178
sudo chown -R $USER /usr/local/lib/python2.7
186179
- name: Display Python version
187180
run: python -c "import sys; print(sys.version)"
@@ -193,21 +186,6 @@ jobs:
193186
run: |
194187
curl -o get-pip.py https://bootstrap.pypa.io/pip/3.3/get-pip.py
195188
python get-pip.py
196-
- name: Ensure working pip on 2.6
197-
if: ${{ matrix.python-version == '2.6' }}
198-
run: |
199-
# pypi deprecated SNI-less access to the CDN, so we have to download
200-
# the packages manually
201-
curl -o get-pip.py https://bootstrap.pypa.io/pip/2.6/get-pip.py
202-
wget https://files.pythonhosted.org/packages/ac/95/a05b56bb975efa78d3557efa36acaf9cf5d2fd0ee0062060493687432e03/pip-9.0.3-py2.py3-none-any.whl
203-
wget https://files.pythonhosted.org/packages/27/f6/fabfc9c71c9b1b99d2ec4768a6e1f73b2e924f51c89d436302b8c2a25459/setuptools-36.8.0-py2.py3-none-any.whl
204-
wget https://files.pythonhosted.org/packages/8a/e9/8468cd68b582b06ef554be0b96b59f59779627131aad48f8a5bce4b13450/wheel-0.29.0-py2.py3-none-any.whl
205-
wget https://files.pythonhosted.org/packages/f2/94/3af39d34be01a24a6e65433d19e107099374224905f1e0cc6bbe1fd22a2f/argparse-1.4.0-py2.py3-none-any.whl
206-
python get-pip.py pip-9.0.3-py2.py3-none-any.whl setuptools-36.8.0-py2.py3-none-any.whl wheel-0.29.0-py2.py3-none-any.whl argparse-1.4.0-py2.py3-none-any.whl
207-
pip list
208-
wget https://files.pythonhosted.org/packages/3b/7e/293d19ccd106119e35db4bf3e111b1895098f618b455b758aa636496cf03/setuptools-28.8.0-py2.py3-none-any.whl
209-
wget https://files.pythonhosted.org/packages/83/53/e120833aa2350db333df89a40dea3b310dd9dabf6f29eaa18934a597dc79/wheel-0.30.0a0-py2.py3-none-any.whl
210-
pip install setuptools-28.8.0-py2.py3-none-any.whl wheel-0.30.0a0-py2.py3-none-any.whl
211189
- name: Install instrumental
212190
if: ${{ contains(matrix.opt-deps, 'instrumental') }}
213191
run: pip install instrumental
@@ -220,43 +198,7 @@ jobs:
220198
- name: Install gmpy2
221199
if: ${{ contains(matrix.tox-env, 'gmpy2') || contains(matrix.tox-env, 'instrumental') || matrix.mutation == 'true' }}
222200
run: pip install gmpy2
223-
- name: Install build dependencies (2.6)
224-
if: ${{ matrix.python-version == '2.6' }}
225-
run: |
226-
wget https://files.pythonhosted.org/packages/1d/4e/20c679f8c5948f7c48591fde33d442e716af66a31a88f5791850a75041eb/tox-2.9.1-py2.py3-none-any.whl
227-
wget https://files.pythonhosted.org/packages/d9/9d/077582a4c6d771e3b742631e6c1d3688f48210626de488e032776242b3f2/inflect-0.3.0-py2.py3-none-any.whl
228-
wget https://files.pythonhosted.org/packages/79/db/7c0cfe4aa8341a5fab4638952520d8db6ab85ff84505e12c00ea311c3516/pyOpenSSL-17.5.0-py2.py3-none-any.whl
229-
wget https://files.pythonhosted.org/packages/2d/bf/960e5a422db3ac1a5e612cb35ca436c3fc985ed4b7ed13a1b4879006f450/cffi-1.13.2.tar.gz
230-
wget https://files.pythonhosted.org/packages/4b/2a/0276479a4b3caeb8a8c1af2f8e4355746a97fab05a372e4a2c6a6b876165/idna-2.7-py2.py3-none-any.whl
231-
wget https://files.pythonhosted.org/packages/72/20/7f0f433060a962200b7272b8c12ba90ef5b903e218174301d0abfd523813/unittest2-1.1.0-py2.py3-none-any.whl
232-
wget https://files.pythonhosted.org/packages/a8/5a/5cf074e1c6681dcbb4e640113f58bed16955e7da9a6c8090b518031775e7/hypothesis-2.0.0.tar.gz
233-
wget https://files.pythonhosted.org/packages/85/d5/818d0e603685c4a613d56f065a721013e942088047ff1027a632948bdae6/coverage-4.5.4.tar.gz
234-
wget https://files.pythonhosted.org/packages/e6/35/f187bdf23be87092bd0f1200d43d23076cee4d0dec109f195173fd3ebc79/mock-2.0.0-py2.py3-none-any.whl
235-
wget https://files.pythonhosted.org/packages/ed/ea/e20b5cbebf45d3096e8138ab74eda139595d827677f38e9dd543e6015bdf/virtualenv-15.2.0-py2.py3-none-any.whl
236-
wget https://files.pythonhosted.org/packages/53/67/9620edf7803ab867b175e4fd23c7b8bd8eba11cb761514dcd2e726ef07da/py-1.4.34-py2.py3-none-any.whl
237-
wget https://files.pythonhosted.org/packages/65/26/32b8464df2a97e6dd1b656ed26b2c194606c16fe163c695a992b36c11cdf/six-1.13.0-py2.py3-none-any.whl
238-
wget https://files.pythonhosted.org/packages/4d/d1/e478b8a33230f85f38e35b386376fbd115219de2a2c4c8783610851ad1c3/pluggy-0.5.2-py2.py3-none-any.whl
239-
wget https://files.pythonhosted.org/packages/78/c5/7188f15a92413096c93053d5304718e1f6ba88b818357d05d19250ebff85/cryptography-2.1.4.tar.gz
240-
wget https://files.pythonhosted.org/packages/8c/2d/aad7f16146f4197a11f8e91fb81df177adcc2073d36a17b1491fd09df6ed/pycparser-2.18.tar.gz
241-
wget https://files.pythonhosted.org/packages/a2/55/8f8cab2afd404cf578136ef2cc5dfb50baa1761b68c9da1fb1e4eed343c9/docopt-0.6.2.tar.gz
242-
wget https://files.pythonhosted.org/packages/65/47/7e02164a2a3db50ed6d8a6ab1d6d60b69c4c3fdf57a284257925dfc12bda/requests-2.19.1-py2.py3-none-any.whl
243-
wget https://files.pythonhosted.org/packages/17/0a/6ac05a3723017a967193456a2efa0aa9ac4b51456891af1e2353bb9de21e/traceback2-1.4.0-py2.py3-none-any.whl
244-
wget https://files.pythonhosted.org/packages/31/77/3781f65cafe55480b56914def99022a5d2965a4bb269655c89ef2f1de3cd/importlib-1.0.4.zip
245-
wget https://files.pythonhosted.org/packages/7d/b0/23d19892f8d91ec9c5b8a2035659bce23587fed419d68fa3d70b6abf8bcd/Counter-1.0.0.tar.gz
246-
wget https://files.pythonhosted.org/packages/69/cb/f5be453359271714c01b9bd06126eaf2e368f1fddfff30818754b5ac2328/funcsigs-1.0.2-py2.py3-none-any.whl
247-
wget https://files.pythonhosted.org/packages/fb/48/69046506f6ac61c1eaa9a0d42d22d54673b69e176d30ca98e3f61513e980/pbr-5.5.1-py2.py3-none-any.whl
248-
wget https://files.pythonhosted.org/packages/b5/a8/56be92dcd4a5bf1998705a9b4028249fe7c9a035b955fe93b6a3e5b829f8/asn1crypto-1.4.0-py2.py3-none-any.whl
249-
wget https://files.pythonhosted.org/packages/6f/2c/a9386903ece2ea85e9807e0e062174dc26fdce8b05f216d00491be29fad5/enum34-1.1.10-py2-none-any.whl
250-
wget https://files.pythonhosted.org/packages/c2/f8/49697181b1651d8347d24c095ce46c7346c37335ddc7d255833e7cde674d/ipaddress-1.0.23-py2.py3-none-any.whl
251-
wget https://files.pythonhosted.org/packages/bc/a9/01ffebfb562e4274b6487b4bb1ddec7ca55ec7510b22e4c51f14098443b8/chardet-3.0.4-py2.py3-none-any.whl
252-
wget https://files.pythonhosted.org/packages/bd/c9/6fdd990019071a4a32a5e7cb78a1d92c53851ef4f56f62a3486e6a7d8ffb/urllib3-1.23-py2.py3-none-any.whl
253-
wget https://files.pythonhosted.org/packages/5e/a0/5f06e1e1d463903cf0c0eebeb751791119ed7a4b3737fdc9a77f1cdfb51f/certifi-2020.12.5-py2.py3-none-any.whl
254-
wget https://files.pythonhosted.org/packages/c7/a3/c5da2a44c85bfbb6eebcfc1dde24933f8704441b98fdde6528f4831757a6/linecache2-1.0.0-py2.py3-none-any.whl
255-
wget https://files.pythonhosted.org/packages/53/25/ef88e8e45db141faa9598fbf7ad0062df8f50f881a36ed6a0073e1572126/ordereddict-1.1.tar.gz
256-
wget https://files.pythonhosted.org/packages/ef/41/d8a61f1b2ba308e96b36106e95024977e30129355fd12087f23e4b9852a1/pytest-3.2.5-py2.py3-none-any.whl
257-
pip install pycparser-2.18.tar.gz importlib-1.0.4.zip Counter-1.0.0.tar.gz tox-2.9.1-py2.py3-none-any.whl inflect-0.3.0-py2.py3-none-any.whl pyOpenSSL-17.5.0-py2.py3-none-any.whl cffi-1.13.2.tar.gz idna-2.7-py2.py3-none-any.whl unittest2-1.1.0-py2.py3-none-any.whl hypothesis-2.0.0.tar.gz coverage-4.5.4.tar.gz mock-2.0.0-py2.py3-none-any.whl virtualenv-15.2.0-py2.py3-none-any.whl py-1.4.34-py2.py3-none-any.whl six-1.13.0-py2.py3-none-any.whl pluggy-0.5.2-py2.py3-none-any.whl cryptography-2.1.4.tar.gz docopt-0.6.2.tar.gz requests-2.19.1-py2.py3-none-any.whl traceback2-1.4.0-py2.py3-none-any.whl funcsigs-1.0.2-py2.py3-none-any.whl pbr-5.5.1-py2.py3-none-any.whl asn1crypto-1.4.0-py2.py3-none-any.whl enum34-1.1.10-py2-none-any.whl ipaddress-1.0.23-py2.py3-none-any.whl chardet-3.0.4-py2.py3-none-any.whl urllib3-1.23-py2.py3-none-any.whl certifi-2020.12.5-py2.py3-none-any.whl linecache2-1.0.0-py2.py3-none-any.whl ordereddict-1.1.tar.gz pytest-3.2.5-py2.py3-none-any.whl git+https://github.com/tomato42/coveralls-python.git@add-py26#egg=coveralls
258201
- name: Install build dependencies
259-
if: ${{ matrix.python-version != '2.6' }}
260202
run: |
261203
PYTHON_VERSION=${{ matrix.python-version }}
262204
PYTHON_VERSION=${PYTHON_VERSION#pypy-}
@@ -273,21 +215,14 @@ jobs:
273215
- name: Display installed python package versions
274216
run: pip list
275217
- name: Test native speed
276-
# tox uses pip to install dependenceis, so it breaks on py2.6
277-
if: ${{ !contains(matrix.tox-env, 'gmpy') && matrix.python-version != '2.6' && ! matrix.mutation && !contains(matrix.tox-env, 'codechecks') }}
218+
if: ${{ !contains(matrix.tox-env, 'gmpy') && ! matrix.mutation && !contains(matrix.tox-env, 'codechecks') }}
278219
run: tox -e speed
279220
- name: Test speed with gmpy
280221
if: ${{ contains(matrix.tox-env, 'gmpyp') }}
281222
run: tox -e speedgmpy
282223
- name: Test speed with gmpy2
283224
if: ${{ contains(matrix.tox-env, 'gmpy2') }}
284225
run: tox -e speedgmpy2
285-
- name: Run unit tests (2.6)
286-
if: ${{ matrix.python-version == '2.6' }}
287-
run: |
288-
# because tox uses pip, and pip is broken on py2.6, we need run the
289-
# tests directly on the system
290-
coverage run --branch -m pytest
291226
- name: Run unit tests
292227
if: ${{ matrix.tox-env }}
293228
run: tox -e ${{ matrix.tox-env }}
@@ -378,12 +313,7 @@ jobs:
378313
COVERALLS_SERVICE_NAME: github
379314
PY_VERSION: ${{ matrix.python-version }}
380315
run: |
381-
if [[ $PY_VERSION == "2.6" ]]; then
382-
COVERALLS_SKIP_SSL_VERIFY=1 coveralls
383-
else
384316
coveralls
385-
fi
386-
387317
coveralls:
388318
name: Indicate completion to coveralls.io
389319
needs: test

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ curves over prime fields.
4545
## Dependencies
4646

4747
This library uses only Python and the 'six' package. It is compatible with
48-
Python 2.6, 2.7, and 3.6+. It also supports execution on alternative
48+
Python 2.7, and 3.7+. It also supports execution on alternative
4949
implementations like pypy and pypy3.
5050

5151
If `gmpy2` or `gmpy` is installed, they will be used for faster arithmetic.

0 commit comments

Comments
 (0)