diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index b4fd692..0b212d8 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -30,22 +30,19 @@ jobs: with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('requirements/*.txt') }} - restore-keys: | - ${{ runner.os }}-pip-py${{ matrix.python-version }}- + restore-keys: ${{ runner.os }}-pip-py${{ matrix.python-version }}- - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -U pip wheel; - pip install -r requirements/install.txt -r requirements/install_async.txt -r requirements/unittests.txt --extra-index-url https://download.pytorch.org/whl/cpu; + pip install -U pip wheel + pip install -r requirements/install.txt -r requirements/install_async.txt -r requirements/unittests.txt --extra-index-url https://download.pytorch.org/whl/cpu pip install --no-deps . - name: Run Tests - run: | - coverage run -m unittest + run: coverage run -m unittest - name: Statistics - if: success() run: | coverage report coverage xml diff --git a/setup.py b/setup.py index f34ba9c..c14e316 100644 --- a/setup.py +++ b/setup.py @@ -13,13 +13,12 @@ def resolve_requirements(file): - path_dir = os.path.dirname(file) requirements = [] with open(file) as f: req = f.read().splitlines() for r in req: - r_path = os.path.join(path_dir, r.split(" ")[1]) if r.startswith("-r"): + r_path = os.path.join(os.path.dirname(file), r.split(" ")[1]) requirements += resolve_requirements(r_path) else: requirements.append(r)