Skip to content

Commit 995a5e9

Browse files
Z-FranZ-Fran
authored
[Fix] deprecate codecov from requirements (#505)
* [Fix] deprecate codecov from requirements * [Fix] deprecate codecov from requirements * add converage * add requests * ubuntu22.04 * ubuntu22.04 * ubuntu22.04
1 parent 97e9f22 commit 995a5e9

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎.github/workflows/merge_stage_test.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

1919
jobs:
2020
build_cpu_py:
21-
runs-on: ubuntu-18.04
21+
runs-on: ubuntu-22.04
2222
strategy:
2323
matrix:
2424
python-version: [3.6, 3.8, 3.9]
@@ -27,9 +27,9 @@ jobs:
2727
- torch: 1.8.1
2828
torchvision: 0.9.1
2929
steps:
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
3131
- name: Set up Python ${{ matrix.python-version }}
32-
uses: actions/setup-python@v2
32+
uses: actions/setup-python@v4
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535
- name: Get MMCV_TORCH as the environment variable
@@ -51,7 +51,7 @@ jobs:
5151
coverage xml
5252
coverage report -m
5353
build_cpu_pt:
54-
runs-on: ubuntu-18.04
54+
runs-on: ubuntu-22.04
5555
strategy:
5656
matrix:
5757
python-version: [3.7]
@@ -72,9 +72,9 @@ jobs:
7272
- torch: 1.11.0
7373
torchvision: 0.12.0
7474
steps:
75-
- uses: actions/checkout@v2
75+
- uses: actions/checkout@v3
7676
- name: Set up Python ${{ matrix.python-version }}
77-
uses: actions/setup-python@v2
77+
uses: actions/setup-python@v4
7878
with:
7979
python-version: ${{ matrix.python-version }}
8080
- name: Upgrade pip
@@ -107,7 +107,7 @@ jobs:
107107
uses: mxschmitt/action-tmate@v3
108108

109109
build_cu102:
110-
runs-on: ubuntu-18.04
110+
runs-on: ubuntu-22.04
111111
container:
112112
image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
113113
strategy:
@@ -117,9 +117,9 @@ jobs:
117117
- torch: 1.8.1
118118
cuda: 10.2
119119
steps:
120-
- uses: actions/checkout@v2
120+
- uses: actions/checkout@v3
121121
- name: Set up Python ${{ matrix.python-version }}
122-
uses: actions/setup-python@v2
122+
uses: actions/setup-python@v4
123123
with:
124124
python-version: ${{ matrix.python-version }}
125125
- name: Upgrade pip
@@ -129,7 +129,7 @@ jobs:
129129
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
130130
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
131131
- name: Install PyTorch
132-
run: python -m pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
132+
run: pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
133133
- name: Install Python-dev
134134
run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
135135
if: ${{matrix.python-version != 3.9}}
@@ -142,8 +142,7 @@ jobs:
142142
pip install -r requirements.txt
143143
- name: Build and install
144144
run: |
145-
python setup.py check -m -s
146-
TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
145+
pip install -e .
147146
- name: Setup tmate session
148147
if: ${{ failure() }}
149148
uses: mxschmitt/action-tmate@v3

‎.github/workflows/pr_stage_test.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ concurrency:
1616

1717
jobs:
1818
build_cpu:
19-
runs-on: ubuntu-18.04
19+
runs-on: ubuntu-22.04
2020
strategy:
2121
matrix:
2222
python-version: [3.7]
2323
include:
2424
- torch: 1.8.1
2525
torchvision: 0.9.1
2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
2828
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v2
29+
uses: actions/setup-python@v4
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232
- name: Upgrade pip
@@ -61,7 +61,7 @@ jobs:
6161
uses: mxschmitt/action-tmate@v3
6262

6363
build_cu102:
64-
runs-on: ubuntu-18.04
64+
runs-on: ubuntu-22.04
6565
container:
6666
image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
6767
strategy:
@@ -71,19 +71,19 @@ jobs:
7171
- torch: 1.8.1
7272
cuda: 10.2
7373
steps:
74-
- uses: actions/checkout@v2
74+
- uses: actions/checkout@v3
7575
- name: Set up Python ${{ matrix.python-version }}
76-
uses: actions/setup-python@v2
76+
uses: actions/setup-python@v4
7777
with:
7878
python-version: ${{ matrix.python-version }}
7979
- name: Upgrade pip
80-
run: python -m pip install pip --upgrade
80+
run: pip install pip --upgrade
8181
- name: Fetch GPG keys
8282
run: |
8383
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
8484
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
8585
- name: Install PyTorch
86-
run: python -m pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
86+
run: pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
8787
- name: Get MMCV_TORCH and MMCV_CUDA as environment variables
8888
run: . .github/workflows/scripts/get_mmcv_var.sh ${{matrix.torch}} ${{matrix.cuda}}
8989
shell: bash
@@ -96,12 +96,11 @@ jobs:
9696
apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev
9797
- name: Install mmgen dependencies
9898
run: |
99-
python -m pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/${MMCV_CUDA}/torch${MMCV_TORCH}/index.html
100-
python -m pip install -r requirements.txt
99+
pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/${MMCV_CUDA}/torch${MMCV_TORCH}/index.html
100+
pip install -r requirements.txt
101101
- name: Build and install
102102
run: |
103-
python setup.py check -m -s
104-
TORCH_CUDA_ARCH_LIST=7.0 python -m pip install -e .
103+
pip install -e .
105104
- name: Setup tmate session
106105
if: ${{ failure() }}
107106
uses: mxschmitt/action-tmate@v3

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ repos:
4545
name: update-model-index
4646
description: Collect model information and update model-index.yml
4747
entry: .dev_scripts/github/update_model_index.py
48-
additional_dependencies: [mmcv]
48+
additional_dependencies: [mmcv==1.6.1]
4949
language: python
5050
files: ^configs/.*\.md$
5151
require_serial: true

‎requirements/runtime.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ mmcls
22
ninja
33
numpy
44
prettytable
5+
requests
56
scikit-image
67
scipy
78
tqdm

‎requirements/tests.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
codecov
1+
coverage < 7.0.0
2+
# codecov
23
flake8
34
interrogate
45
isort==4.3.21

0 commit comments

Comments
 (0)