diff --git a/.conda/meta.yaml b/.conda/meta.yaml index b5f9bca17..9cdb75712 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -27,7 +27,7 @@ requirements: - matplotlib >=3.1.0 - h5py >=3.1.0, <4.0.0 - opencv >=4.5.0, <5.0.0 - - pypdfium2_helpers >=4.0.0, <5.0.0 + - pypdfium2-team::pypdfium2_helpers >=4.0.0, <5.0.0 - pyclipper >=1.2.0, <2.0.0 - shapely >=1.6.0, <3.0.0 - langdetect >=1.0.9, <2.0.0 diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 959346817..53f4643be 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: python: ["3.8", "3.9"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - if: matrix.os == 'macos-latest' name: Install MacOS prerequisites run: brew install cairo pango gdk-pixbuf libffi @@ -53,18 +53,20 @@ jobs: conda: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true python-version: 3.8 + channels: pypdfium2-team,bblanchon,conda-forge + channel-priority: strict - name: Install dependencies shell: bash -el {0} run: conda install -y conda-build conda-verify anaconda-client - - name: Build and publish + - name: Build and verify shell: bash -el {0} run: | python setup.py sdist mkdir conda-dist - conda build .conda/ -c conda-forge -c pypdfium2-team -c bblanchon --output-folder conda-dist - ls -l conda-dist/noarch/*tar.bz2 + conda build .conda/ --output-folder conda-dist + conda-verify conda-dist/noarch/*tar.bz2 --ignore=C1115 diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 8f86d4f52..8b3f768d2 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -19,7 +19,7 @@ jobs: - if: matrix.os == 'macos-latest' name: Install MacOS prerequisites run: brew install cairo pango gdk-pixbuf libffi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6ece3f59a..bde470382 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,7 +10,7 @@ jobs: docker-package: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build docker image run: docker build -t doctr-tf-py3.8-slim --build-arg SYSTEM=cpu . - name: Run docker container @@ -23,7 +23,7 @@ jobs: os: [ubuntu-latest] python: ["3.8"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 73000a757..ff8e87e71 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,7 +11,7 @@ jobs: os: [ubuntu-latest] python: ["3.8"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - name: Set up Python diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00a10786b..3be297ed6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: os: [ubuntu-latest] python: ["3.8"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -47,7 +47,7 @@ jobs: os: [ubuntu-latest] python: ["3.8"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -80,7 +80,7 @@ jobs: os: [ubuntu-latest] python: ["3.8"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -112,7 +112,7 @@ jobs: runs-on: ubuntu-latest needs: [ pytest-common, pytest-tf, pytest-torch ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml index dc55bb1f4..03240d549 100644 --- a/.github/workflows/pr-labels.yml +++ b/.github/workflows/pr-labels.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up python uses: actions/setup-python@v4 - name: Install requests diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4d6f61199..73e81525d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ jobs: python: ["3.8"] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -53,7 +53,7 @@ jobs: python: ["3.8"] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.8 uses: actions/setup-python@v4 with: @@ -69,11 +69,13 @@ jobs: if: "!github.event.release.prerelease" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true python-version: 3.8 + channels: pypdfium2-team,bblanchon,conda-forge + channel-priority: strict - name: Install dependencies shell: bash -el {0} run: conda install -y conda-build conda-verify anaconda-client @@ -89,8 +91,8 @@ jobs: echo "BUILD_VERSION=${VERSION}" >> $GITHUB_ENV python setup.py sdist mkdir conda-dist - conda build .conda/ -c conda-forge -c pypdfium2-team -c bblanchon --output-folder conda-dist - ls -l conda-dist/noarch/*tar.bz2 + conda build .conda/ --output-folder conda-dist + conda-verify conda-dist/noarch/*tar.bz2 --ignore=C1115 anaconda upload conda-dist/noarch/*tar.bz2 conda-check: @@ -105,4 +107,5 @@ jobs: - name: Install package shell: bash -el {0} run: | - conda install -c mindee doctr + conda config --set channel_priority strict + conda install -c mindee -c pypdfium2-team -c bblanchon -c conda-forge python-doctr diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index ade0d3a50..74656f831 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -8,7 +8,7 @@ jobs: docs-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.8 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/references.yml b/.github/workflows/references.yml index 722832064..17dffe439 100644 --- a/.github/workflows/references.yml +++ b/.github/workflows/references.yml @@ -16,7 +16,7 @@ jobs: python: ["3.8"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -68,7 +68,7 @@ jobs: python: ["3.8"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -134,7 +134,7 @@ jobs: python: ["3.8"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -189,7 +189,7 @@ jobs: python: ["3.8"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -233,7 +233,7 @@ jobs: python: ["3.8"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -277,7 +277,7 @@ jobs: python: ["3.8"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -332,7 +332,7 @@ jobs: python: ["3.8"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -378,7 +378,7 @@ jobs: python: ["3.8"] framework: [tensorflow, pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -422,7 +422,7 @@ jobs: python: ["3.8"] framework: [pytorch] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml index f8e8e3b11..97d01ef6a 100644 --- a/.github/workflows/scripts.yml +++ b/.github/workflows/scripts.yml @@ -19,7 +19,7 @@ jobs: - if: matrix.os == 'macos-latest' name: Install MacOS prerequisites run: brew install cairo pango gdk-pixbuf libffi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -65,7 +65,7 @@ jobs: - if: matrix.os == 'macos-latest' name: Install MacOS prerequisites run: brew install cairo pango gdk-pixbuf libffi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -111,7 +111,7 @@ jobs: - if: matrix.os == 'macos-latest' name: Install MacOS prerequisites run: brew install cairo pango gdk-pixbuf libffi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -152,7 +152,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python: ["3.8", "3.9"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index b7767f3ff..49885ace7 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -14,7 +14,7 @@ jobs: os: [ubuntu-latest] python: ["3.8"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -33,7 +33,7 @@ jobs: os: [ubuntu-latest] python: ["3.8"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: