Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

Commit

Permalink
Merge pull request #133 from Borda/pkg/build
Browse files Browse the repository at this point in the history
pkg: add missing requirements in manifest
  • Loading branch information
justusschock authored Feb 22, 2023
2 parents 3d459fb + e110123 commit ab6fbcf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ab6fbcf

Please sign in to comment.