Fix isort issue (#3198)

* fix isort issue * limit isort version to 4.3.21 * add --recursive back for isort
open-mmlab · Jul 4, 2020 · ca9c447 · ca9c447
1 parent 588536d
commit ca9c447
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 62 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,6 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     env:
@@ -25,61 +24,61 @@ jobs:
             cuda_arch: "7.0"
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install CUDA
-      run: |
-        export INSTALLER=cuda-repo-${UBUNTU_VERSION}_${CUDA}_amd64.deb
-        wget http://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/${INSTALLER}
-        sudo dpkg -i ${INSTALLER}
-        wget https://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/7fa2af80.pub
-        sudo apt-key add 7fa2af80.pub
-        sudo apt update -qq
-        sudo apt install -y cuda-${CUDA_SHORT/./-} cuda-cufft-dev-${CUDA_SHORT/./-}
-        sudo apt clean
-        export CUDA_HOME=/usr/local/cuda-${CUDA_SHORT}
-        export LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${CUDA_HOME}/include:${LD_LIBRARY_PATH}
-        export PATH=${CUDA_HOME}/bin:${PATH}
-        sudo apt-get install -y ninja-build
-    - name: Install Pillow
-      run: pip install Pillow==6.2.2
-      if: ${{matrix.torchvision < 0.5}}
-    - name: Install PyTorch
-      run: pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}}
-    - name: Install mmdet dependencies
-      run: |
-        pip install mmcv
-        pip install -r requirements.txt
-        pip install "git+https://github.com/open-mmlab/cocoapi.git#subdirectory=pycocotools"
-    - name: Lint with flake8
-      run: flake8 .
-    - name: Lint with isort
-      run: isort -rc --check-only --diff mmdet/ tools/ tests/
-    - name: Format with yapf
-      run: yapf -r -d mmdet/ tools/ configs/ tests/
-    - name: Check docstring
-      run: interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --exclude mmdet/ops --ignore-regex "__repr__" --fail-under 80 mmdet
-    - name: Build and install
-      env:
-        CUDA_ARCH: ${{matrix.cuda_arch}}
-      run: |
-        rm -rf .eggs
-        python setup.py check -m -s
-        TORCH_CUDA_ARCH_LIST=${CUDA_ARCH} python setup.py build_ext --inplace
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install CUDA
+        run: |
+          export INSTALLER=cuda-repo-${UBUNTU_VERSION}_${CUDA}_amd64.deb
+          wget http://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/${INSTALLER}
+          sudo dpkg -i ${INSTALLER}
+          wget https://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/7fa2af80.pub
+          sudo apt-key add 7fa2af80.pub
+          sudo apt update -qq
+          sudo apt install -y cuda-${CUDA_SHORT/./-} cuda-cufft-dev-${CUDA_SHORT/./-}
+          sudo apt clean
+          export CUDA_HOME=/usr/local/cuda-${CUDA_SHORT}
+          export LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${CUDA_HOME}/include:${LD_LIBRARY_PATH}
+          export PATH=${CUDA_HOME}/bin:${PATH}
+          sudo apt-get install -y ninja-build
+      - name: Install Pillow
+        run: pip install Pillow==6.2.2
+        if: ${{matrix.torchvision < 0.5}}
+      - name: Install PyTorch
+        run: pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}}
+      - name: Install mmdet dependencies
+        run: |
+          pip install mmcv
+          pip install -r requirements.txt
+          pip install "git+https://github.com/open-mmlab/cocoapi.git#subdirectory=pycocotools"
+      - name: Lint with flake8
+        run: flake8 .
+      - name: Lint with isort
+        run: isort --recursive --check-only --diff mmdet/ tools/ tests/
+      - name: Format with yapf
+        run: yapf -r -d mmdet/ tools/ configs/ tests/
+      - name: Check docstring
+        run: interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --exclude mmdet/ops --ignore-regex "__repr__" --fail-under 80 mmdet
+      - name: Build and install
+        env:
+          CUDA_ARCH: ${{matrix.cuda_arch}}
+        run: |
+          rm -rf .eggs
+          python setup.py check -m -s
+          TORCH_CUDA_ARCH_LIST=${CUDA_ARCH} python setup.py build_ext --inplace
 
-    - name: Run unittests and generate coverage report
-      run: |
-        coverage run --branch --source mmdet -m pytest tests/
-        coverage xml
-        coverage report -m
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1.0.7
-      with:
-        file: ./coverage.xml
-        flags: unittests
-        env_vars: OS,PYTHON
-        name: codecov-umbrella
-        fail_ci_if_error: false
+      - name: Run unittests and generate coverage report
+        run: |
+          coverage run --branch --source mmdet -m pytest tests/
+          coverage xml
+          coverage report -m
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1.0.10
+        with:
+          file: ./coverage.xml
+          flags: unittests
+          env_vars: OS,PYTHON
+          name: codecov-umbrella
+          fail_ci_if_error: false
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -2,12 +2,10 @@ asynctest
 codecov
 flake8
 interrogate
-isort
+isort==4.3.21
 # Note: used for kwarray.group_items, this may be ported to mmcv in the future.
 kwarray
 pytest
-pytest-cov
-pytest-runner
 ubelt
-xdoctest >= 0.10.0
+xdoctest>=0.10.0
 yapf