Merge branch 'main' into try_except

.conda/meta.yaml

@@ -24,7 +24,6 @@ requirements:
     - numpy >=1.16.0, <2.0.0
     - scipy >=1.4.0, <2.0.0
     - pillow >=9.2.0
-    - matplotlib >=3.1.0
     - h5py >=3.1.0, <4.0.0
     - opencv >=4.5.0, <5.0.0
     - pypdfium2-team::pypdfium2_helpers >=4.0.0, <5.0.0
@@ -33,10 +32,7 @@ requirements:
     - langdetect >=1.0.9, <2.0.0
     - rapidfuzz >=3.0.0, <4.0.0
     - huggingface_hub >=0.20.0, <1.0.0
-    - matplotlib >=3.1.0
-    - weasyprint >=55.0
     - defusedxml >=0.7.0
-    - mplcursors >=0.3
     - anyascii >=0.3.2
     - tqdm >=4.30.0
 

.github/workflows/builds.yml

@@ -21,32 +21,32 @@ jobs:
         name: Install MacOS prerequisites
         run: brew install cairo pango gdk-pixbuf libffi
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
       - if: matrix.framework == 'tensorflow'
         name: Cache python modules (TF)
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}
       - if: matrix.framework == 'pytorch'
         name: Cache python modules (PT)
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}
       - if: matrix.framework == 'tensorflow'
         name: Install package (TF)
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[tf] --upgrade
+          pip install -e .[tf,viz,html] --upgrade
       - if: matrix.framework == 'pytorch'
         name: Install package (PT)
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[torch] --upgrade
+          pip install -e .[torch,viz,html] --upgrade
       - name: Import package
         run: python -c "import doctr; print(doctr.__version__)"
 

.github/workflows/demo.yml

@@ -21,19 +21,19 @@ jobs:
         run: brew install cairo pango gdk-pixbuf libffi
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
       - if: matrix.framework == 'tensorflow'
         name: Cache python modules (TF)
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('demo/tf-requirements.txt') }}
       - if: matrix.framework == 'pytorch'
         name: Cache python modules (PT)
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('demo/pt-requirements.txt') }}
@@ -42,13 +42,13 @@ jobs:
         name: Install dependencies (TF)
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[tf] --upgrade
+          pip install -e .[tf,viz,html] --upgrade
           pip install -r demo/tf-requirements.txt
       - if: matrix.framework == 'pytorch'
         name: Install dependencies (PT)
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[torch] --upgrade
+          pip install -e .[torch,viz,html] --upgrade
           pip install -r demo/pt-requirements.txt
 
       - if: matrix.framework == 'tensorflow'

.github/workflows/doc-status.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           architecture: x64

.github/workflows/docker.yml

@@ -24,7 +24,7 @@ jobs:
         python: ["3.9"]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64

.github/workflows/docs.yml

@@ -15,19 +15,19 @@ jobs:
         with:
           persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
       - name: Cache python modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}-docs
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[tf]
+          pip install -e .[tf,viz,html]
           pip install -e .[docs]
 
       - name: Build documentation

.github/workflows/main.yml

@@ -16,25 +16,25 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
       - name: Cache python modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}-tests
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[tf] --upgrade
+          pip install -e .[tf,viz,html] --upgrade
           pip install -e .[testing]
       - name: Run unittests
         run: |
           coverage run -m pytest tests/common/
           coverage xml -o coverage-common.xml
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage-common
           path: ./coverage-common.xml
@@ -49,25 +49,25 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
       - name: Cache python modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}-tests
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[tf] --upgrade
+          pip install -e .[tf,viz,html] --upgrade
           pip install -e .[testing]
       - name: Run unittests
         run: |
           coverage run -m pytest tests/tensorflow/
           coverage xml -o coverage-tf.xml
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage-tf
           path: ./coverage-tf.xml
@@ -82,27 +82,27 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
       - name: Cache python modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}-tests
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[torch] --upgrade
+          pip install -e .[torch,viz,html] --upgrade
           pip install -e .[testing]
 
       - name: Run unittests
         run: |
           coverage run -m pytest tests/pytorch/
           coverage xml -o coverage-pt.xml
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage-pytorch
           path: ./coverage-pt.xml
@@ -113,9 +113,10 @@ jobs:
     needs: [ pytest-common, pytest-tf, pytest-torch ]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           flags: unittests
           fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pr-labels.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Set up python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
       - name: Install requests
         run: pip install requests
       - name: Process commit and find merger responsible for labeling

.github/workflows/public_docker_images.yml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         # Must match version at https://www.python.org/ftp/python/
         python: ["3.9.18", "3.10.13", "3.11.8"]
-        framework: ["tf", "torch"]
+        framework: ["tf", "torch", "tf,viz,html,contrib", "torch,viz,html,contrib"]
         system: ["cpu", "gpu"]
 
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.

.github/workflows/publish.yml

@@ -16,12 +16,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
       - name: Cache python modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}
@@ -55,7 +55,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: x64

.github/workflows/pull_requests.yml

@@ -10,19 +10,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           architecture: x64
       - name: Cache python modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pkg-deps-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}-docs
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[tf] --upgrade
+          pip install -e .[tf,viz,html] --upgrade
           pip install -e .[docs]
 
       - name: Build documentation