Skip to content

Commit de04017

Browse files
hc2phc2p
authored
Merge branch 'main' into ach/optimization
2 parents eac0115 + 0b22cd2 commit de04017

File tree

5 files changed

+159
-7
lines changed

5 files changed

+159
-7
lines changed

‎gpu/setup.python.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ ln -s /usr/bin/python3 /usr/bin/python
3030

3131
# We need to remove some pre-installed pip packages that end up clashing with our compute-deps
3232
pip uninstall -y cryptography
33+
pip install numpy==1.23.4
3334

3435
# install tensorflow
3536
pip install tensorflow==$TF_VERSION

‎python/datascience/Dockerfile.datascience‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ RUN pip install --upgrade pip
77
# Add the requirements files
88
ADD requirements-3.11+.txt /requirements-3.11+.txt
99
ADD requirements-below-3.11.txt /requirements-below-3.11.txt
10+
ADD constraints.txt /constraints.txt
1011

1112
#Determine the Python version and set the version-specifications file
1213
ARG FROM_PYTHON_VERSION
14+
15+
RUN python -m pip install --upgrade setuptools pip
16+
1317
RUN if [ "$(printf '%s\n' "$FROM_PYTHON_VERSION" "3.11" | sort -V | head -n1)" = "3.11" ]; then \
1418
mv "requirements-3.11+.txt" "requirements.txt" \
1519
; else \
@@ -20,7 +24,7 @@ RUN if [ "$(printf '%s\n' "$FROM_PYTHON_VERSION" "3.11" | sort -V | head -n1)" =
2024
# Combine all RUN commands into one to minimize the number of layers
2125
RUN apt-get update \
2226
&& apt-get install -y --no-install-recommends gcc \
23-
&& pip install --no-cache-dir -r requirements.txt \
27+
&& pip install --no-cache-dir -r requirements.txt -c constraints.txt \
2428
&& apt-get purge -y gcc \
2529
&& apt-get autoremove -y \
2630
&& apt-get clean \

‎python/datascience/constraints.txt‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
MarkupSafe>=0.9.2
2+
MarkupSafe>=2.0
3+
SQLAlchemy<2.0.0,>=0.9.2
4+
SQLAlchemy>=1.3.0
5+
altair>=4.2.2,<=5.5
6+
asttokens>=2.1.0
7+
asynch>=0.2.2
8+
attrs>=19.2.0
9+
backports.functools-lru-cache>=1.2.1
10+
bcrypt>=3.2
11+
botocore<1.36.0,>=1.35.10
12+
botocore<2.0a.0,>=1.33.2
13+
cachetools<6.0,>=2.0.0
14+
certifi>=2017.4.17
15+
cffi>=1.12
16+
cffi>=1.4.1
17+
charset-normalizer<4,>=2
18+
click-plugins>=1.0
19+
click>=4.0
20+
clickhouse-driver>=0.1.2
21+
clickhouse-sqlalchemy>0,<0.4
22+
click~=8.0
23+
cligj>=0.5
24+
cryptography<44,>=41.0.5
25+
cryptography>=3.3
26+
db-dtypes>=1.2.0,<1.4
27+
dill==0.3.8
28+
dnspython<3.0.0,>=1.16.0
29+
dnspython>=2.2.1,<2.7
30+
duckdb>=0.9.2,<0.10.0
31+
executing>=1.2.0
32+
fiona>=1.8
33+
geopandas>=0.11.1,<1.1
34+
google-api-core!=2.0.*,!=2.1.*,!=2.10.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,<3.0.0dev,>=1.34.0
35+
google-api-core!=2.0.*,!=2.1.*,!=2.10.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,<3.0.0dev,>=1.34.1
36+
google-api-core!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,<3.0.0dev,>=1.32.0
37+
google-api-core!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0,<3.0.0dev,>=1.31.5
38+
google-api-core!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0,<3.0.0dev,>=1.31.6
39+
google-auth<3.0.0dev,>=1.25.0
40+
google-auth<3.0.0dev,>=2.14.1
41+
google-auth<3.0.dev0,>=2.14.1
42+
google-auth<3.0dev,>=1.25.0
43+
google-cloud-bigquery-storage==2.16.2
44+
google-cloud-bigquery<4.0.0dev,>=3.3.6
45+
google-cloud-core<3.0.0dev,>=1.6.0
46+
google-cloud-core<3.0dev,>=1.4.4
47+
google-cloud-spanner>=3.12.0
48+
google-crc32c<2.0dev,>=1.0
49+
google-resumable-media<3.0dev,>=0.6.0
50+
googleapis-common-protos<2.0.0dev,>=1.56.0
51+
googleapis-common-protos<2.0.dev0,>=1.56.2
52+
googleapis-common-protos>=1.5.5
53+
greenlet!=0.4.17
54+
grpc-google-iam-v1<1.0.0dev,>=0.12.4
55+
grpc-interceptor>=0.15.4
56+
grpcio<2.0.0dev,>=1.44.0
57+
grpcio>=1.49.1,<2.0.0
58+
grpcio>=1.62.3
59+
idna<4,>=2.5
60+
importlib-metadata>1.0.0
61+
ipykernel>6.22.0
62+
jedi>=0.16
63+
jinja2>=2.11.3,<3.1
64+
jmespath<2.0.0,>=0.7.1
65+
jsonschema>=3.0
66+
numpy>=1.16.6
67+
numpy>=1.19,<2
68+
numpy>=1.20.3
69+
numpy>=1.21,<2
70+
numpy>=1.21.0
71+
numpy>=1.23,<2
72+
numpy>=1.23.2
73+
numpy>=1.24,<2
74+
packaging>=17.0
75+
packaging>=20.0.0
76+
pandas>=0.18
77+
pandas>=0.24.2
78+
pandas>=1.0.0
79+
pandas>=1.2.5,<2.2
80+
paramiko>=2.7.2
81+
paramiko>=3.0.0,<3.6
82+
parso<0.8.0,>=0.7.0
83+
pexpect>4.3
84+
pg8000==1.31.2
85+
prompt-toolkit!=3.0.37,<3.1.0,>=3.0.30
86+
proto-plus<2.0.0dev,>=1.22.0
87+
proto-plus<2.0.0dev,>=1.22.2
88+
proto-plus<2.0.0dev,>=1.22.3
89+
protobuf!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<5.0.0dev,>=3.19.5
90+
protobuf!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<6.0.0.dev0,>=3.19.5
91+
protobuf!=3.20.0,!=3.20.1,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<6.0.0.dev0,>=3.20.2
92+
protobuf!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<6.0.0dev,>=3.20.2
93+
protobuf!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<6.0.0dev,>=3.20.2
94+
protobuf<6.0.0dev,>=3.19.0
95+
protobuf>=4.21.6
96+
psycopg2-binary>=2.9.4,<2.10
97+
ptyprocess>=0.5
98+
pyarrow>13.0.0,<=17.0.0
99+
pyarrow>=10.0.0,<=17.0.0
100+
pyarrow>=3.0.0
101+
pyarrow>=5.0.0
102+
pyasn1-modules>=0.2.1
103+
pyasn1<0.7.0,>=0.4.6
104+
pyasn1>=0.1.3
105+
pyathena==3.9.0
106+
pygments>=2.4.0
107+
pymongo>=4.3.2,<4.10
108+
pymssql>=2.2.9,<2.4
109+
pymysql>=1.0.2,<1.2
110+
pynacl>=1.5
111+
pyproj>=2.6.1.post1
112+
python-dateutil<3.0.0,>=2.1
113+
python-dateutil<3.0dev,>=2.7.2
114+
python-dateutil>=2.8.1
115+
pytz>=2020.1
116+
requests<3.0.0.dev0,>=2.18.0
117+
requests<3.0.0dev,>=2.21.0
118+
requests>=2.31.0
119+
rsa<5,>=3.1.4
120+
s3transfer<0.11.0,>=0.10.0
121+
sentry-sdk>=1.24,<2.15
122+
shapely<2,>=1.7
123+
six>=1.12.0
124+
six>=1.5
125+
snowflake-sqlalchemy>=1,<1.7
126+
sqlalchemy-bigquery>1.6.1,<1.12
127+
sqlalchemy-dremio>=3.0.3,<3.1
128+
sqlalchemy-redshift>=0.8.11,<0.9
129+
sqlalchemy-spanner>=1.6.2,<2.0.0
130+
sqlalchemy<1.5,>=1.4.24
131+
sqlalchemy<3.0.0dev,>=1.4.16
132+
sqlalchemy>=1.1.13
133+
sqlalchemy>=1.3.24
134+
sqlparse>=0.4.4
135+
sqlparse>=0.4.4,<0.6
136+
sshtunnel==0.4.0
137+
traitlets>=5
138+
trino>=0.327.0,<=0.330.0
139+
typing-extensions>=3.6.4
140+
typing-extensions>=4
141+
urllib3!=2.2.0,<3,>=1.25.4
142+
urllib3<1.27,>=1.25.4
143+
urllib3<3,>=1.21.1
144+
urllib3>=1.25.7
145+
urllib3>=1.26.11
146+
urllib3>=1.26.9
147+
zipp>=0.5

‎python/datascience/requirements-3.11+.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ scipy==1.11.*
22
matplotlib==3.8.*
33
scikit-learn==1.3.*
44
agate==1.9.*
5-
keras==2.14.*
5+
keras>=2.10,<3
66
nltk==3.8.*
77
spacy==3.7.*
88
seaborn==0.13.*
99
scrapy==2.11.*
1010
jsonify==0.5
11-
datascience==0.17.*
11+
datascience>=0.17,<1
1212
textblob==0.17.*
1313
tabulate==0.9.*
1414
sympy==1.12
1515
squarify==0.4.*
16-
tensorflow==2.14.*
16+
tensorflow>=2.10,<3
1717
torch==2.1.*
1818
torchvision==0.16.*

‎python/datascience/requirements-below-3.11.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ scipy==1.9.*
33
matplotlib==3.6.*
44
scikit-learn==1.1.*
55
agate==1.6.*
6-
keras==2.10.*
6+
keras>=2.10,<3
77
nltk==3.7.*
88
spacy==3.4.*
99
seaborn==0.13.*
1010
scrapy==2.7.*
1111
jsonify==0.5
12-
datascience==0.17.*
12+
datascience>=0.17,<1
1313
textblob==0.17.*
1414
tabulate==0.9.*
1515
sympy==1.11.*
1616
squarify==0.4.*
17-
tensorflow==2.10.*
17+
tensorflow>=2.10,<3
1818
torch==1.12.*
1919
torchvision==0.13.*

0 commit comments

Comments
 (0)