Skip to content

Commit e8e4bba

Browse files
committed
Merge branch 'main' into ios-support
2 parents 0e61fa8 + 991985d commit e8e4bba

File tree

4 files changed

+3
-103
lines changed

4 files changed

+3
-103
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- os: ubuntu-latest
6161
python: 'pypy-3.9'
6262
- os: ubuntu-latest
63-
python: 'pypy-3.10'
63+
python: 'pypy-3.11'
6464
- os: ubuntu-latest
6565
python: '3.8'
6666
- os: ubuntu-latest
@@ -252,38 +252,6 @@ jobs:
252252
run: python -m pytest --showlocals -vv
253253
shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0}
254254

255-
pyston:
256-
runs-on: ubuntu-20.04
257-
strategy:
258-
fail-fast: false
259-
matrix:
260-
python:
261-
- '3.8'
262-
meson:
263-
-
264-
265-
steps:
266-
- name: Checkout
267-
uses: actions/checkout@v4
268-
269-
- name: Install pyston
270-
run: |
271-
wget https://github.com/pyston/pyston/releases/download/pyston_2.3.5/pyston_2.3.5_20.04_amd64.deb
272-
sudo apt install $(pwd)/pyston_2.3.5_20.04_amd64.deb
273-
274-
- name: Install Ninja
275-
run: sudo apt-get install ninja-build
276-
277-
- name: Install Meson
278-
run: python -m pip install "meson ${{ matrix.meson }}"
279-
if: ${{ matrix.meson }}
280-
281-
- name: Install
282-
run: pyston -m pip install .[test]
283-
284-
- name: Run tests
285-
run: pyston -m pytest --showlocals -vv
286-
287255
homebrew:
288256
runs-on: macos-latest
289257
strategy:

docs/spelling_wordlist.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ executables
1111
frontend
1212
Github
1313
macOS
14-
nox
1514
Numpy
1615
pre
1716
pluggy

noxfile.py

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

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ backend-path = ['.']
88
requires = [
99
'meson >= 0.64.0; python_version < "3.12"',
1010
'meson >= 1.2.3; python_version >= "3.12"',
11-
'packaging >= 19.0; sys_platform != "ios"',
11+
'packaging >= 23.2; sys_platform != "ios"',
1212
'packaging >= 24.2; sys_platform == "ios"',
1313
'pyproject-metadata >= 0.9.0',
1414
'tomli >= 1.0.0; python_version < "3.11"',
@@ -37,7 +37,7 @@ classifiers = [
3737
dependencies = [
3838
'meson >= 0.64.0; python_version < "3.12"',
3939
'meson >= 1.2.3; python_version >= "3.12"',
40-
'packaging >= 19.0; sys_platform != "ios"',
40+
'packaging >= 23.2; sys_platform != "ios"',
4141
'packaging >= 24.2; sys_platform == "ios"',
4242
'pyproject-metadata >= 0.9.0',
4343
'tomli >= 1.0.0; python_version < "3.11"',
@@ -46,7 +46,6 @@ dependencies = [
4646
[project.optional-dependencies]
4747
test = [
4848
'build',
49-
'packaging >= 23.1',
5049
'pytest >= 6.0',
5150
'pytest-cov[toml]',
5251
'pytest-mock',

0 commit comments

Comments
 (0)