Skip to content

Commit 7a87ffd

Browse files
oliverholworthykarlhigley
authored andcommitted
Update package requires_dist to remove extras that are not required (#1727)
* Remove test/dev/docs from extras requires * Update requirements/gpu.txt to use pip package names * Add extra index url for rapids packages to tox.ini
1 parent 020b24b commit 7a87ffd

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

requirements/gpu.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
-r base.txt
2-
cudf>=21.12
3-
dask-cudf>=21.12
4-
dask-cuda>=21.12
5-
cupy>=7
1+
cudf-cu11
2+
dask-cudf-cu11
3+
cupy-cuda11x

setup.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,10 @@ def read_requirements(req_path, filename):
7676
return packages
7777

7878

79-
requirements = {
80-
"cpu": read_requirements("requirements", "base.txt"),
79+
install_requires = read_requirements("requirements", "base.txt")
80+
extras_require = {
8181
"gpu": read_requirements("requirements", "gpu.txt"),
8282
}
83-
dev_requirements = {
84-
"dev": read_requirements("requirements", "dev.txt"),
85-
"test": read_requirements("requirements", "test.txt"),
86-
"docs": read_requirements("requirements", "docs.txt"),
87-
}
8883

8984
with open("README.md", encoding="utf8") as readme_file:
9085
long_description = readme_file.read()
@@ -109,9 +104,6 @@ def read_requirements(req_path, filename):
109104
cmdclass=cmdclass,
110105
ext_modules=ext_modules,
111106
zip_safe=False,
112-
install_requires=requirements["cpu"],
113-
extras_require={
114-
**requirements,
115-
**dev_requirements,
116-
},
107+
install_requires=install_requires,
108+
extras_require=extras_require,
117109
)

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ requires = pybind11
99
commands =
1010
pip install --upgrade pip
1111
pip install .
12+
setenv =
13+
PIP_EXTRA_INDEX_URL=https://pypi.ngc.nvidia.com
1214

1315
[testenv:test-cpu]
1416
; Runs in: Github Actions

0 commit comments

Comments
 (0)