Skip to content

Commit 015050f

Browse files
svlandegsvlandeg
committed
Merge branch 'master' into feature/coref
2 parents 838f501 + f6a4b80 commit 015050f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1653
-532
lines changed

‎.github/azure-steps.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ steps:
6464
displayName: "Run GPU tests"
6565
condition: eq(${{ parameters.gpu }}, true)
6666
67-
# - script: |
68-
# python -m spacy download ca_core_news_sm
69-
# python -m spacy download ca_core_news_md
70-
# python -c "import spacy; nlp=spacy.load('ca_core_news_sm'); doc=nlp('test')"
71-
# displayName: 'Test download CLI'
72-
# condition: eq(variables['python_version'], '3.8')
67+
- script: |
68+
python -m spacy download ca_core_news_sm
69+
python -m spacy download ca_core_news_md
70+
python -c "import spacy; nlp=spacy.load('ca_core_news_sm'); doc=nlp('test')"
71+
displayName: 'Test download CLI'
72+
condition: eq(variables['python_version'], '3.8')
7373
7474
- script: |
7575
python -m spacy convert extra/example_data/ner_example_data/ner-token-per-line-conll2003.json .
@@ -93,17 +93,17 @@ steps:
9393
displayName: 'Test train CLI'
9494
condition: eq(variables['python_version'], '3.8')
9595
96-
# - script: |
97-
# python -c "import spacy; config = spacy.util.load_config('ner.cfg'); config['components']['ner'] = {'source': 'ca_core_news_sm'}; config.to_disk('ner_source_sm.cfg')"
98-
# PYTHONWARNINGS="error,ignore::DeprecationWarning" python -m spacy assemble ner_source_sm.cfg output_dir
99-
# displayName: 'Test assemble CLI'
100-
# condition: eq(variables['python_version'], '3.8')
101-
#
102-
# - script: |
103-
# python -c "import spacy; config = spacy.util.load_config('ner.cfg'); config['components']['ner'] = {'source': 'ca_core_news_md'}; config.to_disk('ner_source_md.cfg')"
104-
# python -m spacy assemble ner_source_md.cfg output_dir 2>&1 | grep -q W113
105-
# displayName: 'Test assemble CLI vectors warning'
106-
# condition: eq(variables['python_version'], '3.8')
96+
- script: |
97+
python -c "import spacy; config = spacy.util.load_config('ner.cfg'); config['components']['ner'] = {'source': 'ca_core_news_sm'}; config.to_disk('ner_source_sm.cfg')"
98+
PYTHONWARNINGS="error,ignore::DeprecationWarning" python -m spacy assemble ner_source_sm.cfg output_dir
99+
displayName: 'Test assemble CLI'
100+
condition: eq(variables['python_version'], '3.8')
101+
102+
- script: |
103+
python -c "import spacy; config = spacy.util.load_config('ner.cfg'); config['components']['ner'] = {'source': 'ca_core_news_md'}; config.to_disk('ner_source_md.cfg')"
104+
python -m spacy assemble ner_source_md.cfg output_dir 2>&1 | grep -q W113
105+
displayName: 'Test assemble CLI vectors warning'
106+
condition: eq(variables['python_version'], '3.8')
107107
108108
- script: |
109109
python .github/validate_universe_json.py website/meta/universe.json

‎.github/workflows/gputests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
branch: [master, v4]
13+
if: github.repository_owner == 'explosion'
1314
runs-on: ubuntu-latest
1415
steps:
1516
- name: Trigger buildkite build

‎.github/workflows/slowtests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
branch: [master, v4]
13+
if: github.repository_owner == 'explosion'
1314
runs-on: ubuntu-latest
1415
steps:
1516
- name: Checkout

‎.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
repos:
22
- repo: https://github.com/ambv/black
3-
rev: 21.6b0
3+
rev: 22.3.0
44
hooks:
55
- id: black
66
language_version: python3.7
7+
additional_dependencies: ['click==8.0.4']
78
- repo: https://gitlab.com/pycqa/flake8
89
rev: 3.9.2
910
hooks:

‎extra/DEVELOPER_DOCS/ExplosionBot.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Explosion-bot
2+
3+
Explosion-bot is a robot that can be invoked to help with running particular test commands.
4+
5+
## Permissions
6+
7+
Only maintainers have permissions to summon explosion-bot. Each of the open source repos that use explosion-bot has its own team(s) of maintainers, and only github users who are members of those teams can successfully run bot commands.
8+
9+
## Running robot commands
10+
11+
To summon the robot, write a github comment on the issue/PR you wish to test. The comment must be in the following format:
12+
13+
```
14+
@explosion-bot please test_gpu
15+
```
16+
17+
Some things to note:
18+
19+
* The `@explosion-bot please` must be the beginning of the command - you cannot add anything in front of this or else the robot won't know how to parse it. Adding anything at the end aside from the test name will also confuse the robot, so keep it simple!
20+
* The command name (such as `test_gpu`) must be one of the tests that the bot knows how to run. The available commands are documented in the bot's [workflow config](https://github.com/explosion/spaCy/blob/master/.github/workflows/explosionbot.yml#L26) and must match exactly one of the commands listed there.
21+
* The robot can't do multiple things at once, so if you want it to run multiple tests, you'll have to summon it with one comment per test.
22+
* For the `test_gpu` command, you can specify an optional thinc branch (from the spaCy repo) or a spaCy branch (from the thinc repo) with either the `--thinc-branch` or `--spacy-branch` flags. By default, the bot will pull in the PR branch from the repo where the command was issued, and the main branch of the other repository. However, if you need to run against another branch, you can say (for example):
23+
24+
```
25+
@explosion-bot please test_gpu --thinc-branch develop
26+
```
27+
You can also specify a branch from an unmerged PR:
28+
```
29+
@explosion-bot please test_gpu --thinc-branch refs/pull/633/head
30+
```
31+
32+
## Troubleshooting
33+
34+
If the robot isn't responding to commands as expected, you can check its logs in the [Github Action](https://github.com/explosion/spaCy/actions/workflows/explosionbot.yml).
35+
36+
For each command sent to the bot, there should be a run of the `explosion-bot` workflow. In the `Install and run explosion-bot` step, towards the ends of the logs you should see info about the configuration that the bot was run with, as well as any errors that the bot encountered.

‎pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ requires = [
55
"cymem>=2.0.2,<2.1.0",
66
"preshed>=3.0.2,<3.1.0",
77
"murmurhash>=0.28.0,<1.1.0",
8-
"thinc>=8.0.14,<8.1.0",
9-
"blis>=0.4.0,<0.8.0",
8+
"thinc>=8.1.0.dev0,<8.2.0",
9+
"blis>=0.9.0,<0.10.0",
1010
"pathy",
1111
"numpy>=1.15.0",
1212
]

‎requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spacy-legacy>=3.0.9,<3.1.0
33
spacy-loggers>=1.0.0,<2.0.0
44
cymem>=2.0.2,<2.1.0
55
preshed>=3.0.2,<3.1.0
6-
thinc>=8.0.14,<8.1.0
7-
blis>=0.4.0,<0.8.0
6+
thinc>=8.1.0.dev0,<8.2.0
7+
blis>=0.9.0,<0.10.0
88
ml_datasets>=0.2.0,<0.3.0
99
murmurhash>=0.28.0,<1.1.0
1010
wasabi>=0.9.1,<1.1.0
@@ -16,7 +16,7 @@ pathy>=0.3.5
1616
numpy>=1.15.0
1717
requests>=2.13.0,<3.0.0
1818
tqdm>=4.38.0,<5.0.0
19-
pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0
19+
pydantic>=1.7.4,!=1.8,!=1.8.1,<1.10.0
2020
jinja2
2121
langcodes>=3.2.0,<4.0.0
2222
# Official Python utilities
@@ -31,7 +31,7 @@ pytest-timeout>=1.3.0,<2.0.0
3131
mock>=2.0.0,<3.0.0
3232
flake8>=3.8.0,<3.10.0
3333
hypothesis>=3.27.0,<7.0.0
34-
mypy==0.910
34+
mypy>=0.910,<=0.960
3535
types-dataclasses>=0.1.3; python_version < "3.7"
3636
types-mock>=0.1.1
3737
types-requests

‎setup.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ setup_requires =
3838
cymem>=2.0.2,<2.1.0
3939
preshed>=3.0.2,<3.1.0
4040
murmurhash>=0.28.0,<1.1.0
41-
thinc>=8.0.14,<8.1.0
41+
thinc>=8.1.0.dev0,<8.2.0
4242
install_requires =
4343
# Our libraries
4444
spacy-legacy>=3.0.9,<3.1.0
4545
spacy-loggers>=1.0.0,<2.0.0
4646
murmurhash>=0.28.0,<1.1.0
4747
cymem>=2.0.2,<2.1.0
4848
preshed>=3.0.2,<3.1.0
49-
thinc>=8.0.14,<8.1.0
50-
blis>=0.4.0,<0.8.0
49+
thinc>=8.1.0.dev0,<8.2.0
50+
blis>=0.9.0,<0.10.0
5151
wasabi>=0.9.1,<1.1.0
5252
srsly>=2.4.3,<3.0.0
5353
catalogue>=2.0.6,<2.1.0
@@ -57,7 +57,7 @@ install_requires =
5757
tqdm>=4.38.0,<5.0.0
5858
numpy>=1.15.0
5959
requests>=2.13.0,<3.0.0
60-
pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0
60+
pydantic>=1.7.4,!=1.8,!=1.8.1,<1.10.0
6161
jinja2
6262
# Official Python utilities
6363
setuptools

‎spacy/about.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# fmt: off
22
__title__ = "spacy"
3-
__version__ = "3.3.0.dev0"
3+
__version__ = "3.3.0"
44
__download_url__ = "https://github.com/explosion/spacy-models/releases/download"
55
__compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json"
66
__projects__ = "https://github.com/explosion/projects"

0 commit comments

Comments
 (0)