Skip to content

Commit f2f4675

Browse files
authored
Update and consolidate dependencies (#186)
1 parent 0114f35 commit f2f4675

File tree

9 files changed

+29
-234
lines changed

9 files changed

+29
-234
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ You will need a python environment to run the generator. Here are the steps:
1515
5. Run this command to install dependencies:
1616

1717
```
18-
python -m pip install -r ./packages/python/requirements.txt -r ./generator/requirements.txt -r ./tests/python/requirements.txt -r ./tests/generator/requirements.txt
18+
python -m pip install -r ./packages/python/requirements.txt -r ./requirements.txt
1919
```
2020

2121
### Command line

generator/requirements.in

Lines changed: 0 additions & 7 deletions
This file was deleted.

generator/requirements.txt

Lines changed: 0 additions & 69 deletions
This file was deleted.

noxfile.py

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ def _install_requirements(session: nox.Session):
1212
"-r",
1313
"./packages/python/requirements.txt",
1414
"-r",
15-
"./generator/requirements.txt",
16-
"-r",
17-
"./tests/python/requirements.txt",
18-
"-r",
19-
"./tests/generator/requirements.txt",
15+
"./requirements.txt",
2016
)
2117
session.run("pip", "list")
2218

@@ -125,21 +121,7 @@ def update_packages(session: nox.Session):
125121
"--upgrade",
126122
"./packages/python/requirements.in",
127123
)
128-
session.run(
129-
"pip-compile", "--generate-hashes", "--upgrade", "./generator/requirements.in"
130-
)
131-
session.run(
132-
"pip-compile",
133-
"--generate-hashes",
134-
"--upgrade",
135-
"./tests/python/requirements.in",
136-
)
137-
session.run(
138-
"pip-compile",
139-
"--generate-hashes",
140-
"--upgrade",
141-
"./tests/generator/requirements.in",
142-
)
124+
session.run("pip-compile", "--generate-hashes", "--upgrade", "./requirements.in")
143125

144126

145127
@nox.session()

packages/python/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ cattrs==22.2.0 \
1414
--hash=sha256:bc12b1f0d000b9f9bee83335887d532a1d3e99a833d1bf0882151c97d3e68c21 \
1515
--hash=sha256:f0eed5642399423cf656e7b66ce92cdc5b963ecafd041d1b24d136fdde7acf6d
1616
# via -r ./packages/python/requirements.in
17-
exceptiongroup==1.1.0 \
18-
--hash=sha256:327cbda3da756e2de031a3107b81ab7b3770a602c4d16ca618298c526f4bec1e \
19-
--hash=sha256:bcb67d800a4497e1b404c2dd44fca47d3b7a5e5433dbab67f96c1a685cdfdf23
17+
exceptiongroup==1.1.1 \
18+
--hash=sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e \
19+
--hash=sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785
2020
# via cattrs
2121
typing-extensions==4.5.0 \
2222
--hash=sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb \
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# This file is used to generate requirements.txt.
22
# To update requirements.txt, run the following commands.
33
# 1) pip install pip-tools
4-
# 2) pip-compile --generate-hashes --upgrade ./tests/python/requirements.in
4+
# 2) pip-compile --generate-hashes --upgrade ./requirements.in
55

66
attrs
77
cattrs
88
jsonschema
9+
importlib_resources
910
pytest
1011
PyHamcrest

tests/python/requirements.txt renamed to requirements.txt

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,51 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --generate-hashes ./tests/python/requirements.in
5+
# pip-compile --generate-hashes ./requirements.in
66
#
77
attrs==22.2.0 \
88
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
99
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
1010
# via
11-
# -r ./tests/python/requirements.in
11+
# -r ./requirements.in
1212
# cattrs
1313
# jsonschema
1414
# pytest
1515
cattrs==22.2.0 \
1616
--hash=sha256:bc12b1f0d000b9f9bee83335887d532a1d3e99a833d1bf0882151c97d3e68c21 \
1717
--hash=sha256:f0eed5642399423cf656e7b66ce92cdc5b963ecafd041d1b24d136fdde7acf6d
18-
# via -r ./tests/python/requirements.in
18+
# via -r ./requirements.in
1919
colorama==0.4.6 \
2020
--hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
2121
--hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
2222
# via pytest
23-
exceptiongroup==1.1.0 \
24-
--hash=sha256:327cbda3da756e2de031a3107b81ab7b3770a602c4d16ca618298c526f4bec1e \
25-
--hash=sha256:bcb67d800a4497e1b404c2dd44fca47d3b7a5e5433dbab67f96c1a685cdfdf23
23+
exceptiongroup==1.1.1 \
24+
--hash=sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e \
25+
--hash=sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785
2626
# via
2727
# cattrs
2828
# pytest
29-
importlib-metadata==6.0.0 \
30-
--hash=sha256:7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad \
31-
--hash=sha256:e354bedeb60efa6affdcc8ae121b73544a7aa74156d047311948f6d711cd378d
29+
importlib-metadata==6.1.0 \
30+
--hash=sha256:43ce9281e097583d758c2c708c4376371261a02c34682491a8e98352365aad20 \
31+
--hash=sha256:ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09
3232
# via
3333
# jsonschema
3434
# pluggy
3535
# pytest
3636
importlib-resources==5.12.0 \
3737
--hash=sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6 \
3838
--hash=sha256:7b1deeebbf351c7578e09bf2f63fa2ce8b5ffec296e0d349139d43cca061a81a
39-
# via jsonschema
39+
# via
40+
# -r ./requirements.in
41+
# jsonschema
4042
iniconfig==2.0.0 \
4143
--hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
4244
--hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
4345
# via pytest
4446
jsonschema==4.17.3 \
4547
--hash=sha256:0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d \
4648
--hash=sha256:a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6
47-
# via -r ./tests/python/requirements.in
49+
# via -r ./requirements.in
4850
packaging==23.0 \
4951
--hash=sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2 \
5052
--hash=sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97
@@ -60,7 +62,7 @@ pluggy==1.0.0 \
6062
pyhamcrest==2.0.4 \
6163
--hash=sha256:60a41d4783b9d56c9ec8586635d2301db5072b3ea8a51c32dd03c408ae2b0f79 \
6264
--hash=sha256:b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1
63-
# via -r ./tests/python/requirements.in
65+
# via -r ./requirements.in
6466
pyrsistent==0.19.3 \
6567
--hash=sha256:016ad1afadf318eb7911baa24b049909f7f3bb2c5b1ed7b6a8f21db21ea3faa8 \
6668
--hash=sha256:1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 \
@@ -90,10 +92,10 @@ pyrsistent==0.19.3 \
9092
--hash=sha256:f0774bf48631f3a20471dd7c5989657b639fd2d285b861237ea9e82c36a415a9 \
9193
--hash=sha256:f0e7c4b2f77593871e918be000b96c8107da48444d57005b6a6bc61fb4331b2c
9294
# via jsonschema
93-
pytest==7.2.1 \
94-
--hash=sha256:c7c6ca206e93355074ae32f7403e8ea12163b1163c976fee7d4d84027c162be5 \
95-
--hash=sha256:d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42
96-
# via -r ./tests/python/requirements.in
95+
pytest==7.2.2 \
96+
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
97+
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
98+
# via -r ./requirements.in
9799
tomli==2.0.1 \
98100
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
99101
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
@@ -105,9 +107,9 @@ typing-extensions==4.5.0 \
105107
# cattrs
106108
# importlib-metadata
107109
# jsonschema
108-
zipp==3.14.0 \
109-
--hash=sha256:188834565033387710d046e3fe96acfc9b5e86cbca7f39ff69cf21a4128198b7 \
110-
--hash=sha256:9e5421e176ef5ab4c0ad896624e87a7b2f07aca746c9b2aa305952800cb8eecb
110+
zipp==3.15.0 \
111+
--hash=sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b \
112+
--hash=sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556
111113
# via
112114
# importlib-metadata
113115
# importlib-resources

tests/generator/requirements.in

Lines changed: 0 additions & 9 deletions
This file was deleted.

tests/generator/requirements.txt

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)