diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index fc8af4642..966ff8d4d 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -94,8 +94,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Install PyTorch run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html - name: Install MMEngine from main branch @@ -144,8 +144,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Install PyTorch run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html - name: Install MMEngine from main branch @@ -184,8 +184,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Fetch GPG keys run: | apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub @@ -218,8 +218,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Fetch GPG keys run: | apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub @@ -252,8 +252,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Fetch GPG keys run: | apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub @@ -286,8 +286,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: python -m pip install pip --upgrade + - name: Upgrade pip and wheel + run: python -m pip install pip wheel --upgrade - name: Install PyTorch run: pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html - name: Install MMEngine from main branch @@ -318,8 +318,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: python -m pip install pip --upgrade + - name: Upgrade pip and wheel + run: python -m pip install pip wheel --upgrade - name: Install PyTorch run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html - name: Install MMEngine from main branch @@ -352,8 +352,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: brew install ffmpeg jpeg-turbo - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Install PyTorch run: pip install torch==${{ matrix.torch }} torchvision==${{ matrix.torchvision }} - name: Install MMEngine from main branch diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index 313c27ae1..dde09127c 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -32,8 +32,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Fetch GPG keys run: | apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub @@ -74,8 +74,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Fetch GPG keys run: | apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub @@ -108,8 +108,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: python -m pip install pip --upgrade + - name: Upgrade pip and wheel + run: python -m pip install pip wheel --upgrade - name: Install PyTorch run: pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html - name: Install MMEngine from main branch @@ -140,8 +140,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: python -m pip install pip --upgrade + - name: Upgrade pip and wheel + run: python -m pip install pip wheel --upgrade - name: Install PyTorch run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html - name: Install MMEngine from main branch @@ -174,8 +174,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: brew install ffmpeg jpeg-turbo - - name: Upgrade pip - run: pip install pip --upgrade + - name: Upgrade pip and wheel + run: pip install pip wheel --upgrade - name: Install PyTorch run: pip install torch==${{ matrix.torch }} torchvision==${{ matrix.torchvision }} - name: Install MMEngine from main branch diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 05df8a651..b9c6de2a2 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -7,7 +7,7 @@ concurrency: cancel-in-progress: true jobs: - build-n-publish: + build-n-publish_without_ops: runs-on: ubuntu-22.04 if: startsWith(github.event.ref, 'refs/tags') steps: @@ -21,7 +21,7 @@ jobs: - name: Build MMCV run: | sed -i "s/os.getenv('MMCV_WITH_OPS', '1')/os.getenv('MMCV_WITH_OPS', '0')/g" setup.py - python setup.py sdist + python setup.py sdist bdist_wheel - name: Publish distribution to PyPI run: | pip install twine diff --git a/requirements/docs.txt b/requirements/docs.txt index a1ff4d390..b725cc70a 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -7,3 +7,4 @@ sphinx==4.0.2 sphinx-copybutton sphinx_markdown_tables>=0.0.16 torch +urllib3<2.0.0