diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index e540ac19..0d7d66f6 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -39,4 +39,4 @@ jobs: check-docs: uses: Lightning-AI/utilities/.github/workflows/check-docs.yml@main with: - requirements-file: "_requirements/docs.txt" + requirements-file: "requirements/docs.txt" diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 1300a004..20905c2a 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -41,7 +41,7 @@ jobs: - name: Set min. dependencies if: matrix.requires == 'oldest' run: | - for fpath in ('requirements.txt', '_requirements/test.txt'): + for fpath in ('requirements.txt', 'requirements/test.txt'): req = open(fpath).read().replace('>=', '==') open(fpath, 'w').write(req) shell: python diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index 29670d7b..341eb41c 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -10,7 +10,7 @@ jobs: build-docs: uses: Lightning-AI/utilities/.github/workflows/check-docs.yml@main with: - requirements-file: "_requirements/docs.txt" + requirements-file: "requirements/docs.txt" # https://github.com/marketplace/actions/deploy-to-github-pages docs-deploy: diff --git a/.readthedocs.yml b/.readthedocs.yml index f6bb36d5..e67b1544 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -17,4 +17,4 @@ formats: all python: version: 3.7 install: - - requirements: _requirements/docs.txt + - requirements: requirements/docs.txt diff --git a/MANIFEST.in b/MANIFEST.in index 4cd9bf95..55724b79 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -28,7 +28,7 @@ exclude docs # Include the Requirements include requirements.txt -recursive-include _requirements *.tx;t +recursive-include requirements *.tx;t # Exclude Makefile exclude Makefile diff --git a/Makefile b/Makefile index 6a8c0abb..e1d83cd4 100644 --- a/Makefile +++ b/Makefile @@ -6,15 +6,15 @@ export SLURM_LOCALID=0 export SPHINX_MOCK_REQUIREMENTS=0 test: clean - pip install -q -r requirements.txt - pip install -q -r _requirements/test.txt + pip install -q -r requirements/requirements.txt + pip install -q -r requirements/test.txt # use this to run tests python -m coverage run --source lit_data -m pytest src tests -v --flake8 python -m coverage report docs: clean - pip install . --quiet -r _requirements/docs.txt + pip install . --quiet -r requirements/docs.txt python -m sphinx -b html -W --keep-going docs/source docs/build clean: diff --git a/setup.py b/setup.py index 123e7630..4b79c44e 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from setuptools import find_packages, setup _PATH_ROOT = os.path.dirname(__file__) -_PATH_REQUIRES = os.path.join(_PATH_ROOT, "_requirements") +_PATH_REQUIRES = os.path.join(_PATH_ROOT, "requirements") def _load_py_module(fname, pkg="lit_data"):