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/MANIFEST.in b/MANIFEST.in index ce2bd08..32389ce 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,9 @@ include LICENSE include versioneer.py include rising/_version.py +# Include the Requirements +recursive-include requirements *.txt + # Exclude build configs exclude *.yml exclude *.yaml diff --git a/docs/source/conf.py b/docs/source/conf.py index fcfe9ff..1336863 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -25,8 +25,8 @@ import rising # noqa: E402 -for md in ["CONTRIBUTING.md", "README.md"]: - shutil.copy(os.path.join(PATH_ROOT, md), os.path.join(PATH_HERE, md.lower())) +shutil.copy(os.path.join(PATH_ROOT, "README.md"), os.path.join(PATH_HERE, "readme.md")) +shutil.copy(os.path.join(PATH_ROOT, ".github", "CONTRIBUTING.md"), os.path.join(PATH_HERE, "contributing.md")) converted_readme = pypandoc.convert_file("readme.md", "rst").split("\n") os.remove("readme.md") diff --git a/setup.py b/setup.py index 9ec0afa..c14e316 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,8 @@ def resolve_requirements(file): req = f.read().splitlines() for r in req: if r.startswith("-r"): - requirements += resolve_requirements(os.path.join(os.path.dirname(file), r.split(" ")[1])) + r_path = os.path.join(os.path.dirname(file), r.split(" ")[1]) + requirements += resolve_requirements(r_path) else: requirements.append(r) return requirements