Fix CI (explosion#13469)

* Remove hardcoded architecture setting * update classifiers to include Python 3.12
jordankanter · May 3, 2024 · 9628790 · 9628790
1 parent 6c0038c
commit 9628790
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 33 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -30,8 +30,7 @@ jobs:
       - name: Configure Python version
         uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
-          architecture: x64
+          python-version: "3.7"
 
       - name: black
         run: |
@@ -60,9 +59,11 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python_version: ["3.12"]
         include:
+          - os: windows-latest
+            python_version: "3.7"
           - os: macos-latest
             python_version: "3.8"
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             python_version: "3.9"
           - os: windows-latest
             python_version: "3.10"
@@ -79,7 +80,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python_version }}
-          architecture: x64
 
       - name: Install dependencies
         run: |
@@ -93,6 +93,7 @@ jobs:
       - name: Run mypy
         run: |
           python -m mypy spacy
+        if: matrix.python_version != '3.7'
 
       - name: Delete source directory and .egg-info
         run: |
@@ -114,22 +115,22 @@ jobs:
       - name: Test import
         run: python -W error -c "import spacy"
 
-      #      - name: "Test download CLI"
-      #        run: |
-      #          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')"
-      #        if: matrix.python_version == '3.9'
-      #
-      #      - name: "Test download_url in info CLI"
-      #        run: |
-      #          python -W error -m spacy info ca_core_news_sm | grep -q download_url
-      #        if: matrix.python_version == '3.9'
-      #
-      #      - name: "Test no warnings on load (#11713)"
-      #        run: |
-      #          python -W error -c "import ca_core_news_sm; nlp = ca_core_news_sm.load(); doc=nlp('test')"
-      #        if: matrix.python_version == '3.9'
+      - name: "Test download CLI"
+        run: |
+          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')"
+        if: matrix.python_version == '3.9'
+
+      - name: "Test download_url in info CLI"
+        run: |
+          python -W error -m spacy info ca_core_news_sm | grep -q download_url
+        if: matrix.python_version == '3.9'
+
+      - name: "Test no warnings on load (#11713)"
+        run: |
+          python -W error -c "import ca_core_news_sm; nlp = ca_core_news_sm.load(); doc=nlp('test')"
+        if: matrix.python_version == '3.9'
 
       - name: "Test convert CLI"
         run: |
@@ -153,17 +154,17 @@ jobs:
           python -m spacy train ner.cfg --paths.train ner-token-per-line-conll2003.spacy --paths.dev ner-token-per-line-conll2003.spacy --training.max_steps 10 --gpu-id -1
         if: matrix.python_version == '3.9'
 
-      #      - name: "Test assemble CLI"
-      #        run: |
-      #          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')"
-      #          PYTHONWARNINGS="error,ignore::DeprecationWarning" python -m spacy assemble ner_source_sm.cfg output_dir
-      #        if: matrix.python_version == '3.9'
-      #
-      #      - name: "Test assemble CLI vectors warning"
-      #        run: |
-      #          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')"
-      #          python -m spacy assemble ner_source_md.cfg output_dir 2>&1 | grep -q W113
-      #        if: matrix.python_version == '3.9'
+      - name: "Test assemble CLI"
+        run: |
+          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')"
+          PYTHONWARNINGS="error,ignore::DeprecationWarning" python -m spacy assemble ner_source_sm.cfg output_dir
+        if: matrix.python_version == '3.9'
+
+      - name: "Test assemble CLI vectors warning"
+        run: |
+          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')"
+          python -m spacy assemble ner_source_md.cfg output_dir 2>&1 | grep -q W113
+        if: matrix.python_version == '3.9'
 
       - name: "Install test requirements"
         run: |

diff --git a/.github/workflows/universe_validation.yml b/.github/workflows/universe_validation.yml
@@ -25,8 +25,7 @@ jobs:
       - name: Configure Python version
         uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
-          architecture: x64
+          python-version: "3.7"
 
       - name: Validate website/meta/universe.json
         run: |

diff --git a/setup.cfg b/setup.cfg
@@ -21,6 +21,7 @@ classifiers =
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Topic :: Scientific/Engineering
 project_urls =
     Release notes = https://github.com/explosion/spaCy/releases