From 4d5db737e9fb815a24b2d071345392185e44abf2 Mon Sep 17 00:00:00 2001 From: Adriane Boyd Date: Tue, 2 Nov 2021 14:24:06 +0100 Subject: [PATCH 1/3] Revert "Temporarily skip compat tests (#9594)" This reverts commit 667572adca3a95cbcfd92cea43746b2625a40831. --- spacy/tests/test_cli.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/spacy/tests/test_cli.py b/spacy/tests/test_cli.py index 00ae2c056..3243d426b 100644 --- a/spacy/tests/test_cli.py +++ b/spacy/tests/test_cli.py @@ -492,7 +492,6 @@ def test_string_to_list_intify(value): assert string_to_list(value, intify=True) == [1, 2, 3] -@pytest.mark.skip(reason="Temporarily skip until v3.2.0 release") def test_download_compatibility(): spec = SpecifierSet("==" + about.__version__) spec.prereleases = False @@ -503,7 +502,6 @@ def test_download_compatibility(): assert get_minor_version(about.__version__) == get_minor_version(version) -@pytest.mark.skip(reason="Temporarily skip until v3.2.0 release") def test_validate_compatibility_table(): spec = SpecifierSet("==" + about.__version__) spec.prereleases = False From 53a3523910704e6d6801e8ba474b6a3b4db63a57 Mon Sep 17 00:00:00 2001 From: Adriane Boyd Date: Tue, 2 Nov 2021 14:24:54 +0100 Subject: [PATCH 2/3] Revert "Temporarily ignore W095 in assemble CLI CI test (#9460)" This reverts commit 8db574e0b55d00196be50eebc56775a2854c8795. --- .github/azure-steps.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/azure-steps.yml b/.github/azure-steps.yml index 8df593bb7..3460bccea 100644 --- a/.github/azure-steps.yml +++ b/.github/azure-steps.yml @@ -98,8 +98,7 @@ steps: - script: | 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')" - # temporarily ignore W095 - PYTHONWARNINGS="error,ignore:[W095]:UserWarning,ignore::DeprecationWarning" python -m spacy assemble ner_source_sm.cfg output_dir + PYTHONWARNINGS="error,ignore::DeprecationWarning" python -m spacy assemble ner_source_sm.cfg output_dir displayName: 'Test assemble CLI' condition: eq(variables['python_version'], '3.8') From c155f333bb69c6c146224b3295d89c394114aa04 Mon Sep 17 00:00:00 2001 From: Adriane Boyd Date: Tue, 2 Nov 2021 14:25:05 +0100 Subject: [PATCH 3/3] Revert "Temporarily use v3.1.0 models in CI" This reverts commit bd6433bbab66de70086e6df9130aab25cca4fe7e. --- .github/azure-steps.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/azure-steps.yml b/.github/azure-steps.yml index 3460bccea..80c88b0b8 100644 --- a/.github/azure-steps.yml +++ b/.github/azure-steps.yml @@ -65,11 +65,8 @@ steps: condition: eq(${{ parameters.gpu }}, true) - script: | - #python -m spacy download ca_core_news_sm - #python -m spacy download ca_core_news_md - # temporarily install the v3.1.0 models - pip install --no-deps https://github.com/explosion/spacy-models/releases/download/ca_core_news_sm-3.1.0/ca_core_news_sm-3.1.0-py3-none-any.whl - pip install --no-deps https://github.com/explosion/spacy-models/releases/download/ca_core_news_md-3.1.0/ca_core_news_md-3.1.0-py3-none-any.whl + python -m spacy download ca_core_news_sm + python -m spacy download ca_core_news_md python -c "import spacy; nlp=spacy.load('ca_core_news_sm'); doc=nlp('test')" displayName: 'Test download CLI' condition: eq(variables['python_version'], '3.8')