Skip to content

Commit ef017be

Browse files
authored
Move install requires to requirements/default.txt (#6569)
* Move install requires to requirements/default.txt In the same spirit as #6560. * Bump typing_extensions to >=3.10.0.2
1 parent fa31fd1 commit ef017be

File tree

2 files changed

+52
-55
lines changed

2 files changed

+52
-55
lines changed

requirements/default.txt

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# See https://github.com/pyinstaller/pyinstaller/issues/1945
2+
ply>=3.9
3+
colorama>=0.3.9
4+
configobj>=5.0.6
5+
gitpython>3
6+
dulwich>=0.20.23
7+
pygit2>=1.5.0
8+
setuptools>=34.0.0
9+
nanotime>=0.5.2
10+
pyasn1>=0.4.1
11+
voluptuous>=0.11.7
12+
requests>=2.22.0
13+
grandalf==0.6
14+
distro>=1.3.0
15+
appdirs>=1.4.3
16+
ruamel.yaml>=0.17.11
17+
toml>=0.10.1
18+
funcy>=1.14
19+
pathspec>=0.6.0,<0.9.0
20+
shortuuid>=0.5.0
21+
tqdm>=4.45.0,<5
22+
packaging>=19.0
23+
zc.lockfile>=1.2.1
24+
flufl.lock>=3.2,<4
25+
win-unicode-console>=0.5; sys_platform == 'win32'
26+
pywin32>=225; sys_platform == 'win32' and python_version < '3.10'
27+
networkx>=2.5
28+
psutil>=5.8.0
29+
pydot>=1.2.4
30+
speedcopy>=2.0.1; python_version < '3.8' and sys_platform == 'win32'
31+
dataclasses==0.7; python_version < '3.7'
32+
importlib-metadata>=1.4; python_version < '3.8'
33+
flatten_dict>=0.4.1,<1
34+
tabulate>=0.8.7
35+
pygtrie>=2.3.2
36+
dpath>=2.0.1,<3
37+
shtab>=1.3.4,<2
38+
rich>=10.0.0
39+
dictdiffer>=0.8.1
40+
python-benedict>=0.21.1
41+
pyparsing==2.4.7
42+
typing_extensions>=3.10.0.2
43+
fsspec[http]>=2021.8.1
44+
aiohttp-retry==2.4.5
45+
diskcache>=5.2.1

setup.py

Lines changed: 7 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -46,58 +46,8 @@ def run(self):
4646
_build_py.run(self)
4747

4848

49-
install_requires = [
50-
"ply>=3.9", # See https://github.com/pyinstaller/pyinstaller/issues/1945
51-
"colorama>=0.3.9",
52-
"configobj>=5.0.6",
53-
"gitpython>3",
54-
"dulwich>=0.20.23",
55-
"pygit2>=1.5.0",
56-
"setuptools>=34.0.0",
57-
"nanotime>=0.5.2",
58-
"pyasn1>=0.4.1",
59-
"voluptuous>=0.11.7",
60-
"requests>=2.22.0",
61-
"grandalf==0.6",
62-
"distro>=1.3.0",
63-
"appdirs>=1.4.3",
64-
"ruamel.yaml>=0.17.11",
65-
"toml>=0.10.1",
66-
"funcy>=1.14",
67-
"pathspec>=0.6.0,<0.9.0",
68-
"shortuuid>=0.5.0",
69-
"tqdm>=4.45.0,<5",
70-
"packaging>=19.0",
71-
"zc.lockfile>=1.2.1",
72-
"flufl.lock>=3.2,<4",
73-
"win-unicode-console>=0.5; sys_platform == 'win32'",
74-
"pywin32>=225; sys_platform == 'win32' and python_version < '3.10'",
75-
"networkx>=2.5",
76-
"psutil>=5.8.0",
77-
"pydot>=1.2.4",
78-
"speedcopy>=2.0.1; python_version < '3.8' and sys_platform == 'win32'",
79-
"dataclasses==0.7; python_version < '3.7'",
80-
"importlib-metadata>=1.4; python_version < '3.8'",
81-
"flatten_dict>=0.4.1,<1",
82-
"tabulate>=0.8.7",
83-
"pygtrie>=2.3.2",
84-
"dpath>=2.0.1,<3",
85-
"shtab>=1.3.4,<2",
86-
"rich>=10.0.0",
87-
"dictdiffer>=0.8.1",
88-
"python-benedict>=0.21.1",
89-
"pyparsing==2.4.7",
90-
"typing_extensions>=3.7.4; python_version < '3.10'",
91-
# until https://github.com/python/typing/issues/865 is fixed for python3.10
92-
"typing_extensions==3.10.0.0; python_version >= '3.10'",
93-
"fsspec[http]>=2021.8.1",
94-
"aiohttp-retry==2.4.5",
95-
"diskcache>=5.2.1",
96-
]
97-
98-
9949
# Extra dependencies for remote integrations
100-
extra_requirements = {
50+
requirements = {
10151
path.stem: path.read_text().strip().splitlines()
10252
for path in Path("requirements").glob("*.txt")
10353
}
@@ -107,12 +57,14 @@ def run(self):
10757
# requirements, including kerberos itself. Once all the wheels are available,
10858
# we can start shipping it by default.
10959

110-
extra_requirements["all"] = [
60+
install_requires = requirements.pop("default")
61+
requirements["all"] = [
11162
requirements
112-
for key, requirements in extra_requirements.items()
63+
for key, requirements in requirements.items()
11364
if key not in ("tests", "ssh_gssapi", "terraform")
11465
]
115-
extra_requirements["tests"] += extra_requirements["terraform"]
66+
requirements["tests"] += requirements["terraform"]
67+
requirements["dev"] = requirements["all"] + requirements["tests"]
11668

11769
setup(
11870
name="dvc",
@@ -126,7 +78,7 @@ def run(self):
12678
download_url="https://github.com/iterative/dvc",
12779
license="Apache License 2.0",
12880
install_requires=install_requires,
129-
extras_require=extra_requirements,
81+
extras_require=requirements,
13082
keywords="data-science data-version-control machine-learning git"
13183
" developer-tools reproducibility collaboration ai",
13284
python_requires=">=3.6",

0 commit comments

Comments
 (0)