Commit ef73bab6 authored by narugo1992's avatar narugo1992
Browse files

Merge branch 'main' into dev/cdc

parents db0c4780 8d17334e

.github/workflows/badge.yml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ jobs: 
        python-version: [ 3.8 ]

    steps:

      - name: Checkout code

        uses: actions/checkout@v2

        uses: actions/checkout@v3.3.0

        with:

          fetch-depth: 20

          submodules: 'recursive'

.github/workflows/doc.yml

+5 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ jobs: 
        with:

          swap-size-gb: 8

      - name: Checkout code

        uses: actions/checkout@v2

        uses: actions/checkout@v3.3.0

        with:

          fetch-depth: 20

          submodules: 'recursive'
@@ -44,6 +44,7 @@ jobs: 
          sudo apt-get install -y make wget curl cloc graphviz pandoc

          dot -V

          python -m pip install -r requirements.txt

          python -m pip install -r requirements-model.txt

          python -m pip install -r requirements-doc.txt

      - name: Prepare dataset

        uses: nick-fields/retry@v2
@@ -70,7 +71,7 @@ jobs: 
        id: commit

        run: |

          git config user.name 'narugo1992'

          git config user.email 'narugo@126.com'

          git config user.email 'narugo992@gmail.com'

          git add -A

          git diff-index --quiet HEAD || git commit -a -m "dev(narugo): auto sync $(date -R)"

      - name: Push changes
@@ -101,7 +102,7 @@ jobs: 
        with:

          swap-size-gb: 8

      - name: Checkout code

        uses: actions/checkout@v2

        uses: actions/checkout@v3.3.0

        with:

          fetch-depth: 20

          submodules: 'recursive'
@@ -148,7 +149,7 @@ jobs: 
        with:

          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

          GIT_CONFIG_NAME: narugo1992

          GIT_CONFIG_EMAIL: narugo@126.com

          GIT_CONFIG_EMAIL: narugo992@gmail.com

          BRANCH: gh-pages # The branch the action should deploy to.

          FOLDER: public # The folder the action should deploy.

          CLEAN: true # Automatically remove deleted files from the deploy branch

.github/workflows/export.yml

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ jobs: 
        run: |

          cd imgutils-models

          git config user.name 'narugo1992'

          git config user.email 'narugo@126.com'

          git config user.email 'narugo992@gmail.com'

          git add -A

          git diff-index --quiet HEAD || git commit -a -m "dev(narugo): model publish $(date -R)"

          git push https://narugo:$HF_TOKEN@huggingface.co/deepghs/imgutils-models main

.github/workflows/release.yml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ jobs: 


    steps:

      - name: Checkout code

        uses: actions/checkout@v2

        uses: actions/checkout@v3.3.0

        with:

          fetch-depth: 20

          submodules: 'recursive'
@@ -37,7 +37,7 @@ jobs: 
        run: |

          python -m build --sdist --wheel --outdir dist/

      - name: Publish distribution 📦 to real PyPI

        uses: pypa/gh-action-pypi-publish@master

        uses: pypa/gh-action-pypi-publish@v1.8.10

        with:

          password: ${{ secrets.PYPI_PASSWORD }}

      - name: Upload binaries to release

.github/workflows/test.yml

+3 −5
Original line number Diff line number Diff line
@@ -17,14 +17,11 @@ jobs: 
          - 'windows-latest'

          - 'macos-latest'

        python-version:

          - '3.7'

          - '3.8'

          - '3.9'

          - '3.10'

          - '3.11'

        exclude:

          - os: 'macos-latest'

            python-version: '3.7'

          - '3.12'



    steps:

      - name: Get system version for Linux
@@ -59,7 +56,7 @@ jobs: 
        run: |

          echo "IS_PYPY=1" >> $GITHUB_ENV

      - name: Checkout code

        uses: actions/checkout@v2

        uses: actions/checkout@v3.3.0

        with:

          fetch-depth: 20

          submodules: 'recursive'
@@ -89,6 +86,7 @@ jobs: 
          python -m pip install --upgrade pip

          pip install --upgrade flake8 setuptools wheel twine

          pip install -r requirements.txt

          pip install -r requirements-model.txt

          pip install -r requirements-test.txt

      - name: Test the basic environment

        shell: bash