Skip to content

Commit 0625f0f

Browse files
committed
Add M1 support and update dependencies.
1 parent fa36a25 commit 0625f0f

File tree

5 files changed

+220
-179
lines changed

5 files changed

+220
-179
lines changed

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ PYTHON_VERSIONS = 3.6 3.7 3.8
22
REQUIREMENTS = $(addprefix requirements/,${PYTHON_VERSIONS:=.txt})
33
TESTS = $(addprefix tests/,${PYTHON_VERSIONS})
44
IMAGES = $(addprefix image/,${PYTHON_VERSIONS})
5-
RUN = docker run --rm -it
5+
ARCH = $(shell arch)
6+
ifeq (${ARCH}, arm64)
7+
RUN = docker run --rm -it --platform linux/amd64
8+
else
9+
RUN = docker run --rm -it
10+
endif
611
.PHONY : docs
712

813
# Default target
@@ -17,7 +22,7 @@ requirements : ${REQUIREMENTS}
1722
${REQUIREMENTS} : requirements/%.txt : requirements.in setup.py
1823
mkdir -p $(dir $@)
1924
${RUN} -w /workspace -v `pwd`:/workspace python:$* bash -c \
20-
"pip install pip-tools && pip-compile -v -o $@ $<"
25+
"pip install pip-tools && pip-compile -v --upgrade -o $@ $<"
2126

2227

2328
# Targets to build docker images

requirements.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ flake8
44
pytest
55
pytest-cov
66
sphinx
7-
docker<4.3.0

requirements/3.6.txt

Lines changed: 74 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,47 @@
88
# via -r requirements.in
99
alabaster==0.7.12
1010
# via sphinx
11-
attrs==19.3.0
11+
attrs==20.3.0
1212
# via
1313
# jsonschema
1414
# pytest
15-
babel==2.8.0
15+
babel==2.9.0
1616
# via sphinx
1717
bcrypt==3.2.0
1818
# via paramiko
19-
cached-property==1.5.1
19+
cached-property==1.5.2
2020
# via docker-compose
21-
cachetools==4.1.1
21+
cachetools==4.2.1
2222
# via google-auth
23-
certifi==2020.6.20
23+
certifi==2020.12.5
2424
# via requests
25-
cffi==1.14.2
25+
cffi==1.14.5
2626
# via
2727
# bcrypt
2828
# cryptography
2929
# pynacl
30-
chardet==3.0.4
30+
chardet==4.0.0
3131
# via requests
32-
codecov==2.1.8
32+
codecov==2.1.11
3333
# via -r requirements.in
34-
coverage==5.2.1
34+
coverage==5.5
3535
# via
3636
# codecov
3737
# pytest-cov
38-
cryptography==3.0
38+
cryptography==3.4.7
3939
# via paramiko
40-
cx-oracle==8.0.0
40+
cx-oracle==8.1.0
4141
# via testcontainers
42+
dataclasses==0.8
43+
# via libcst
4244
deprecation==2.1.0
4345
# via testcontainers
4446
distro==1.5.0
4547
# via docker-compose
46-
docker-compose==1.26.2
48+
docker-compose==1.29.1
4749
# via testcontainers
48-
docker[ssh]==4.2.2
50+
docker[ssh]==5.0.0
4951
# via
50-
# -r requirements.in
5152
# docker-compose
5253
# testcontainers
5354
dockerpty==0.4.1
@@ -56,21 +57,23 @@ docopt==0.6.2
5657
# via docker-compose
5758
docutils==0.16
5859
# via sphinx
59-
flake8==3.8.3
60+
flake8==3.9.1
6061
# via -r requirements.in
61-
google-api-core[grpc]==1.22.1
62+
google-api-core[grpc]==1.26.3
6263
# via google-cloud-pubsub
63-
google-auth==1.20.1
64+
google-auth==1.29.0
6465
# via google-api-core
65-
google-cloud-pubsub==1.7.0
66+
google-cloud-pubsub==2.4.1
6667
# via testcontainers
67-
googleapis-common-protos[grpc]==1.52.0
68+
googleapis-common-protos[grpc]==1.53.0
6869
# via
6970
# google-api-core
7071
# grpc-google-iam-v1
72+
greenlet==1.0.0
73+
# via sqlalchemy
7174
grpc-google-iam-v1==0.12.3
7275
# via google-cloud-pubsub
73-
grpcio==1.31.0
76+
grpcio==1.37.0
7477
# via
7578
# google-api-core
7679
# googleapis-common-protos
@@ -79,117 +82,122 @@ idna==2.10
7982
# via requests
8083
imagesize==1.2.0
8184
# via sphinx
82-
importlib-metadata==1.7.0
85+
importlib-metadata==3.10.1
8386
# via
8487
# flake8
8588
# jsonschema
8689
# pluggy
8790
# pytest
88-
iniconfig==1.0.1
91+
# sqlalchemy
92+
iniconfig==1.1.1
8993
# via pytest
90-
jinja2==2.11.2
94+
jinja2==2.11.3
9195
# via sphinx
9296
jsonschema==3.2.0
9397
# via docker-compose
94-
kafka-python==2.0.2 # via testcontainers
98+
kafka-python==2.0.2
99+
# via testcontainers
100+
libcst==0.3.18
101+
# via google-cloud-pubsub
95102
markupsafe==1.1.1
96103
# via jinja2
97104
mccabe==0.6.1
98105
# via flake8
99-
more-itertools==8.4.0
100-
# via pytest
101-
neo4j==4.1.0
106+
mypy-extensions==0.4.3
107+
# via typing-inspect
108+
neo4j==4.2.1
102109
# via testcontainers
103-
packaging==20.4
110+
packaging==20.9
104111
# via
105112
# deprecation
113+
# google-api-core
106114
# pytest
107115
# sphinx
108-
paramiko==2.7.1
116+
paramiko==2.7.2
109117
# via docker
110118
pluggy==0.13.1
111119
# via pytest
112-
protobuf==3.13.0
120+
proto-plus==1.18.1
121+
# via google-cloud-pubsub
122+
protobuf==3.15.8
113123
# via
114124
# google-api-core
115125
# googleapis-common-protos
116-
psycopg2-binary==2.8.5
126+
# proto-plus
127+
psycopg2-binary==2.8.6
117128
# via testcontainers
118-
py==1.9.0
129+
py==1.10.0
119130
# via pytest
120131
pyasn1-modules==0.2.8
121132
# via google-auth
122133
pyasn1==0.4.8
123134
# via
124135
# pyasn1-modules
125136
# rsa
126-
pycodestyle==2.6.0
137+
pycodestyle==2.7.0
127138
# via flake8
128139
pycparser==2.20
129140
# via cffi
130-
pyflakes==2.2.0
141+
pyflakes==2.3.1
131142
# via flake8
132-
pygments==2.6.1
143+
pygments==2.8.1
133144
# via sphinx
134-
pymongo==3.11.0
145+
pymongo==3.11.3
135146
# via testcontainers
136-
pymysql==0.10.0
147+
pymysql==1.0.2
137148
# via testcontainers
138149
pynacl==1.4.0
139150
# via paramiko
140151
pyodbc==4.0.30
141152
# via testcontainers
142153
pyparsing==2.4.7
143154
# via packaging
144-
pyrsistent==0.16.0
155+
pyrsistent==0.17.3
145156
# via jsonschema
146-
pytest-cov==2.10.1
157+
pytest-cov==2.11.1
147158
# via -r requirements.in
148-
pytest==6.0.1
159+
pytest==6.2.3
149160
# via
150161
# -r requirements.in
151162
# pytest-cov
152-
python-dotenv==0.14.0
163+
python-dotenv==0.17.0
153164
# via docker-compose
154-
pytz==2020.1
165+
pytz==2021.1
155166
# via
156167
# babel
157168
# google-api-core
158169
# neo4j
159-
pyyaml==5.3.1
160-
# via docker-compose
170+
pyyaml==5.4.1
171+
# via
172+
# docker-compose
173+
# libcst
161174
redis==3.5.3
162175
# via testcontainers
163-
requests==2.24.0
176+
requests==2.25.1
164177
# via
165178
# codecov
166179
# docker
167180
# docker-compose
168181
# google-api-core
169182
# sphinx
170-
rsa==4.6
183+
rsa==4.7.2
171184
# via google-auth
172185
selenium==3.141.0
173186
# via testcontainers
174187
six==1.15.0
175188
# via
176189
# bcrypt
177-
# cryptography
178-
# docker
179-
# docker-compose
180190
# dockerpty
181191
# google-api-core
182192
# google-auth
183193
# grpcio
184194
# jsonschema
185-
# packaging
186195
# protobuf
187196
# pynacl
188-
# pyrsistent
189197
# websocket-client
190-
snowballstemmer==2.0.0
198+
snowballstemmer==2.1.0
191199
# via sphinx
192-
sphinx==3.2.1
200+
sphinx==3.5.4
193201
# via -r requirements.in
194202
sphinxcontrib-applehelp==1.0.2
195203
# via sphinx
@@ -203,23 +211,30 @@ sphinxcontrib-qthelp==1.0.3
203211
# via sphinx
204212
sphinxcontrib-serializinghtml==1.1.4
205213
# via sphinx
206-
sqlalchemy==1.3.18
214+
sqlalchemy==1.4.8
207215
# via testcontainers
208-
texttable==1.6.2
216+
texttable==1.6.3
209217
# via docker-compose
210-
toml==0.10.1
218+
toml==0.10.2
211219
# via pytest
212-
urllib3==1.25.10
220+
typing-extensions==3.7.4.3
221+
# via
222+
# importlib-metadata
223+
# libcst
224+
# typing-inspect
225+
typing-inspect==0.6.0
226+
# via libcst
227+
urllib3==1.26.4
213228
# via
214229
# requests
215230
# selenium
216-
websocket-client==0.57.0
231+
websocket-client==0.58.0
217232
# via
218233
# docker
219234
# docker-compose
220235
wrapt==1.12.1
221236
# via testcontainers
222-
zipp==3.1.0
237+
zipp==3.4.1
223238
# via importlib-metadata
224239

225240
# The following packages are considered to be unsafe in a requirements file:

0 commit comments

Comments
 (0)