fix offending spacy version

ssciwr · Oct 7, 2024 · 89e9200 · 89e9200
1 parent d17d440
commit 89e9200
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 56 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,63 +29,57 @@ jobs:
       if: matrix.os == 'macos-latest'
       run: |
         brew install ffmpeg
-        brew install openblas
-    - name: install openblas on linux
-      if: matrix.os == 'ubuntu-24.04'
-      run: |
-        sudo apt-get install libopenblas-dev
     - name: Install dependencies
       run: |
         pip install -e .
         # python -m pip install uv
         # uv pip install --system -e .
-    # - name: Run pytest test_colors
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_colors.py -svv --cov=. --cov-report=xml --cov-append
-    # - name: Run pytest test_cropposts
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_cropposts.py -svv --cov=. --cov-report=xml --cov-append
-    # - name: Run pytest test_display
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_display.py -svv --cov=. --cov-report=xml --cov-append
-    # - name: Run pytest test_faces
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_faces.py -svv --cov=. --cov-report=xml --cov-append
-    # - name: Run pytest test_multimodal_search
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_multimodal_search.py -m "not long" -svv --cov=. --cov-report=xml --cov-append
-    # - name: Clear cache ubuntu 1
-    #   if: matrix.os == 'ubuntu-22.04'
-    #   run: |
-    #       rm -rf ~/.cache/*    
-    # - name: Run pytest test_summary
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_summary.py -m "not long" -svv --cov=. --cov-report=xml --cov-append
-    # - name: Clear cache ubuntu 2
-    #   if: matrix.os == 'ubuntu-22.04'
-    #   run: |
-    #       rm -rf ~/.cache/*
-    # - name: Run pytest test_text
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_text.py -m "not gcv" -svv --cov=. --cov-report=xml --cov-append
-    # - name: Run pytest test_utils
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_utils.py -svv --cov=. --cov-report=xml --cov-append
-    # - name: Upload coverage
-    #   if: matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.9'
-    #   uses: codecov/codecov-action@v3
-    #   env:
-    #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    #   with:
-    #     fail_ci_if_error: false
-    #     files: ammico/coverage.xml
-    #     verbose: true
-# 
+    - name: Run pytest test_colors
+      run: |
+        cd ammico
+        python -m pytest test/test_colors.py -svv --cov=. --cov-report=xml --cov-append
+    - name: Run pytest test_cropposts
+      run: |
+        cd ammico
+        python -m pytest test/test_cropposts.py -svv --cov=. --cov-report=xml --cov-append
+    - name: Run pytest test_display
+      run: |
+        cd ammico
+        python -m pytest test/test_display.py -svv --cov=. --cov-report=xml --cov-append
+    - name: Run pytest test_faces
+      run: |
+        cd ammico
+        python -m pytest test/test_faces.py -svv --cov=. --cov-report=xml --cov-append
+    - name: Run pytest test_multimodal_search
+      run: |
+        cd ammico
+        python -m pytest test/test_multimodal_search.py -m "not long" -svv --cov=. --cov-report=xml --cov-append
+    - name: Clear cache ubuntu 1
+      if: matrix.os == 'ubuntu-22.04'
+      run: |
+          rm -rf ~/.cache/*    
+    - name: Run pytest test_summary
+      run: |
+        cd ammico
+        python -m pytest test/test_summary.py -m "not long" -svv --cov=. --cov-report=xml --cov-append
+    - name: Clear cache ubuntu 2
+      if: matrix.os == 'ubuntu-22.04'
+      run: |
+          rm -rf ~/.cache/*
+    - name: Run pytest test_text
+      run: |
+        cd ammico
+        python -m pytest test/test_text.py -m "not gcv" -svv --cov=. --cov-report=xml --cov-append
+    - name: Run pytest test_utils
+      run: |
+        cd ammico
+        python -m pytest test/test_utils.py -svv --cov=. --cov-report=xml --cov-append
+    - name: Upload coverage
+      if: matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.9'
+      uses: codecov/codecov-action@v3
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      with:
+        fail_ci_if_error: false
+        files: ammico/coverage.xml
+        verbose: true
diff --git a/pyproject.toml b/pyproject.toml
@@ -44,7 +44,7 @@ dependencies = [
     "retina_face",
     "ammico-lavis>=1.0.2.3",
     "setuptools",
-    "spacy",
+    "spacy<=3.7.5",
     "tensorflow>=2.13.0",
     "torch<2.4.0",
     "transformers",