Skip to content

Commit 5bd20fb

Browse files
add resolver flag for correct dependency detection (#126)
* use resolver flag for correct dependency detection * Update packages using python 3.7 --------- Co-authored-by: Karthik Nadig <[email protected]>
1 parent c2f4bca commit 5bd20fb

File tree

4 files changed

+41
-36
lines changed

4 files changed

+41
-36
lines changed

noxfile.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ def _check_files(names: List[str]) -> None:
3535

3636

3737
def _update_pip_packages(session: nox.Session) -> None:
38-
session.run("pip-compile", "--generate-hashes", "--upgrade", "./requirements.in")
38+
session.run("pip-compile", "--generate-hashes", "--resolver=backtracking", "--upgrade", "./requirements.in")
3939
session.run(
4040
"pip-compile",
4141
"--generate-hashes",
42+
"--resolver=backtracking",
4243
"--upgrade",
4344
"./src/test/python_tests/requirements.in",
4445
)
@@ -90,10 +91,11 @@ def _update_npm_packages(session: nox.Session) -> None:
9091

9192
def _setup_template_environment(session: nox.Session) -> None:
9293
session.install("wheel", "pip-tools")
93-
session.run("pip-compile", "--generate-hashes", "--upgrade", "./requirements.in")
94+
session.run("pip-compile", "--generate-hashes", "--resolver=backtracking", "--upgrade", "./requirements.in")
9495
session.run(
9596
"pip-compile",
9697
"--generate-hashes",
98+
"--resolver=backtracking",
9799
"--upgrade",
98100
"./src/test/python_tests/requirements.in",
99101
)

requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# you plan on supporting when creating the environment or using pip-tools.
55
# Only run the commands below to manully upgrade packages in requirements.txt:
66
# 1) python -m pip install pip-tools
7-
# 2) pip-compile --generate-hashes --upgrade ./requirements.in
7+
# 2) pip-compile --generate-hashes --resolver=backtracking --upgrade ./requirements.in
88
# If you are using nox commands to setup or build package you don't need to
99
# run the above commands manually.
1010

requirements.txt

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +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 ./requirements.in
5+
# pip-compile --generate-hashes --resolver=backtracking ./requirements.in
66
#
77
attrs==23.1.0 \
88
--hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \
99
--hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015
1010
# via
1111
# cattrs
1212
# lsprotocol
13-
cattrs==22.2.0 \
14-
--hash=sha256:bc12b1f0d000b9f9bee83335887d532a1d3e99a833d1bf0882151c97d3e68c21 \
15-
--hash=sha256:f0eed5642399423cf656e7b66ce92cdc5b963ecafd041d1b24d136fdde7acf6d
13+
cattrs==23.1.2 \
14+
--hash=sha256:b2bb14311ac17bed0d58785e5a60f022e5431aca3932e3fc5cc8ed8639de50a4 \
15+
--hash=sha256:db1c821b8c537382b2c7c66678c3790091ca0275ac486c76f3c8f3920e83c657
1616
# via lsprotocol
1717
exceptiongroup==1.1.1 \
1818
--hash=sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e \
1919
--hash=sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785
2020
# via cattrs
21-
importlib-metadata==6.6.0 \
22-
--hash=sha256:43dd286a2cd8995d5eaef7fee2066340423b818ed3fd70adf0bad5f1fac53fed \
23-
--hash=sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705
24-
# via attrs
25-
lsprotocol==2023.0.0a1 \
26-
--hash=sha256:133c339a7cccb299a5b357f9b8ef6aebe27616e0daf4ba54e63476afe0e12e47 \
27-
--hash=sha256:32edfd4856abba1349bf5a070567445b3d7286951afba3644b472629796f82d0
21+
importlib-metadata==6.7.0 \
22+
--hash=sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4 \
23+
--hash=sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5
24+
# via
25+
# attrs
26+
# typeguard
27+
lsprotocol==2023.0.0a2 \
28+
--hash=sha256:80aae7e39171b49025876a524937c10be2eb986f4be700ca22ee7d186b8488aa \
29+
--hash=sha256:c4f2f77712b50d065b17f9b50d2b88c480dc2ce4bbaa56eea8269dbf54bc9701
2830
# via pygls
2931
packaging==23.1 \
3032
--hash=sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61 \
3133
--hash=sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f
3234
# via -r ./requirements.in
33-
pygls==1.0.1 \
34-
--hash=sha256:adacc96da77598c70f46acfdfd1481d3da90cd54f639f7eee52eb6e4dbd57b55 \
35-
--hash=sha256:f3ee98ddbb4690eb5c755bc32ba7e129607f14cbd313575f33d0cea443b78cb2
35+
pygls==1.0.2 \
36+
--hash=sha256:6d278d29fa6559b0f7a448263c85cb64ec6e9369548b02f1a7944060848b21f9 \
37+
--hash=sha256:888ed63d1f650b4fc64d603d73d37545386ec533c0caac921aed80f80ea946a4
3638
# via -r ./requirements.in
37-
typeguard==2.13.3 \
38-
--hash=sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4 \
39-
--hash=sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1
39+
typeguard==3.0.2 \
40+
--hash=sha256:bbe993854385284ab42fd5bd3bee6f6556577ce8b50696d6cb956d704f286c8e \
41+
--hash=sha256:fee5297fdb28f8e9efcb8142b5ee219e02375509cd77ea9d270b5af826358d5a
4042
# via pygls
41-
typing-extensions==4.5.0 \
42-
--hash=sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb \
43-
--hash=sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4
43+
typing-extensions==4.6.3 \
44+
--hash=sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26 \
45+
--hash=sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5
4446
# via
4547
# cattrs
4648
# importlib-metadata
49+
# typeguard
4750
zipp==3.15.0 \
4851
--hash=sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b \
4952
--hash=sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556

src/test/python_tests/requirements.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --generate-hashes ./src/test/python_tests/requirements.in
5+
# pip-compile --generate-hashes --resolver=backtracking ./src/test/python_tests/requirements.in
66
#
77
colorama==0.4.6 \
88
--hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
@@ -12,9 +12,9 @@ exceptiongroup==1.1.1 \
1212
--hash=sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e \
1313
--hash=sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785
1414
# via pytest
15-
importlib-metadata==6.6.0 \
16-
--hash=sha256:43dd286a2cd8995d5eaef7fee2066340423b818ed3fd70adf0bad5f1fac53fed \
17-
--hash=sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705
15+
importlib-metadata==6.7.0 \
16+
--hash=sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4 \
17+
--hash=sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5
1818
# via
1919
# pluggy
2020
# pytest
@@ -26,17 +26,17 @@ packaging==23.1 \
2626
--hash=sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61 \
2727
--hash=sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f
2828
# via pytest
29-
pluggy==1.0.0 \
30-
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
31-
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
29+
pluggy==1.2.0 \
30+
--hash=sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849 \
31+
--hash=sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3
3232
# via pytest
3333
pyhamcrest==2.0.4 \
3434
--hash=sha256:60a41d4783b9d56c9ec8586635d2301db5072b3ea8a51c32dd03c408ae2b0f79 \
3535
--hash=sha256:b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1
3636
# via -r ./src/test/python_tests/requirements.in
37-
pytest==7.3.1 \
38-
--hash=sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362 \
39-
--hash=sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3
37+
pytest==7.3.2 \
38+
--hash=sha256:cdcbd012c9312258922f8cd3f1b62a6580fdced17db6014896053d47cddf9295 \
39+
--hash=sha256:ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b
4040
# via -r ./src/test/python_tests/requirements.in
4141
python-jsonrpc-server==0.4.0 \
4242
--hash=sha256:62c543e541f101ec5b57dc654efc212d2c2e3ea47ff6f54b2e7dcb36ecf20595 \
@@ -46,9 +46,9 @@ tomli==2.0.1 \
4646
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
4747
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
4848
# via pytest
49-
typing-extensions==4.5.0 \
50-
--hash=sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb \
51-
--hash=sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4
49+
typing-extensions==4.6.3 \
50+
--hash=sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26 \
51+
--hash=sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5
5252
# via importlib-metadata
5353
ujson==5.7.0 \
5454
--hash=sha256:00343501dbaa5172e78ef0e37f9ebd08040110e11c12420ff7c1f9f0332d939e \

0 commit comments

Comments
 (0)