Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix v8.2.4 #938

Merged
merged 17 commits into from
Jun 4, 2024
Merged
4 changes: 2 additions & 2 deletions .github/workflows/explosionbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- name: Install and run explosion-bot
run: |
pip install git+https://${{ secrets.EXPLOSIONBOT_TOKEN }}@github.com/explosion/explosion-bot
Expand Down
20 changes: 9 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Configure Python version
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.7"
architecture: x64

- name: black
run: |
Expand All @@ -45,18 +44,18 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-13]
python_version: ["3.12"]
include:
- os: windows-2019
python_version: "3.6"
- os: macos-latest
- os: ubuntu-latest
python_version: "3.7"
- os: ubuntu-latest
python_version: "3.8"
- os: windows-latest
python_version: "3.9"
- os: macos-latest
- os: macos-13
python_version: "3.10"
- os: ubuntu-latest
python_version: "3.11"
Expand All @@ -67,13 +66,12 @@ jobs:

steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Configure Python version
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python_version }}
architecture: x64

- name: Install dependencies
run: |
Expand Down Expand Up @@ -158,8 +156,8 @@ jobs:
pip uninstall -y tensorflow
pip install thinc-apple-ops
python -m pytest --pyargs thinc_apple_ops
if: matrix.os == 'macos-latest' && matrix.python_version == '3.10'
if: matrix.os == 'macos-13' && matrix.python_version == '3.10'

- name: Run tests with thinc-apple-ops
run: python -m pytest --pyargs thinc
if: matrix.os == 'macos-latest' && matrix.python_version == '3.10'
if: matrix.os == 'macos-13' && matrix.python_version == '3.10'
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ types-dataclasses>=0.1.3; python_version < "3.7"
importlib_resources; python_version < "3.7"
# Executing notebook tests
ipykernel>=5.1.4,<5.2.0
nbconvert>=5.6.1,<6.2.0
nbconvert>=5.6.1,<6.5.0
nbformat>=5.0.4,<5.2.0
# Test to_disk/from_disk against pathlib.Path subclasses
pathy>=0.3.5
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ install_requires =
packaging>=20.0
# Backports of modern Python features
dataclasses>=0.6,<1.0; python_version < "3.7"
typing_extensions>=3.7.4.1,<4.5.0; python_version < "3.8"
typing_extensions>=3.7.4.1,<5.0.0; python_version < "3.8"
contextvars>=2.4,<3; python_version < "3.7"

[options.entry_points]
Expand Down
2 changes: 1 addition & 1 deletion thinc/about.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = "8.2.3"
__version__ = "8.2.4"
__release__ = True
1 change: 1 addition & 0 deletions thinc/tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def test_files(nb_file):
raise Exception(f"{output.ename}: {output.evalue}")


@pytest.mark.skip(reason="Notebooks should be updated")
@pytest.mark.parametrize(
"nb_file",
(
Expand Down
2 changes: 1 addition & 1 deletion thinc/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
except ImportError:
from pydantic import ValidationError, create_model # type: ignore

from wasabi import table
from wasabi import table # type: ignore
svlandeg marked this conversation as resolved.
Show resolved Hide resolved

from .compat import (
cupy,
Expand Down