Skip to content

Commit 817d30a

Browse files
cognifloydcognifloyd
authored
Merge pull request #6189 from StackStorm/st2client_deps
Update st2client deps: editor and prompt-toolkit
2 parents 7c335b3 + ff68820 commit 817d30a

File tree

11 files changed

+142
-72
lines changed

11 files changed

+142
-72
lines changed

‎CHANGELOG.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Changed
2121
* Refactor `tools/launchdev.sh` to use `tmux` instead of `screen`. #6186 (by @nzlosh and @cognifloyd)
2222
* Updated package build container environment to use py3.8 and mongo4.4 #6129
2323
* Fic misc DeprecationWarnings to prepare for python 3.10 support. #6188 (by @nzlosh)
24+
* Update st2client deps: editor and prompt-toolkit. #6189 (by @nzlosh)
2425

2526
Added
2627
~~~~~

‎fixed-requirements.txt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,23 @@ oslo.utils==7.1.0
3737
# paramiko 2.11.0 is needed by cryptography > 37.0.0
3838
paramiko==3.4.0
3939
passlib==1.7.4
40-
# For st2client: prompt-toolkit v2+ does not have prompt_toolkit.token.Token
41-
prompt-toolkit==1.0.18
40+
# 202403: bump to 3.0.43 for py3.10 support
41+
prompt-toolkit==3.0.43
4242
pyinotify==0.9.6 ; platform_system=="Linux"
4343
pymongo==3.12.3
4444
pyparsing==3.1.2
4545
zstandard==0.22.0
4646
# pyOpenSSL 23.1.0 supports cryptography up to 40.0.x
4747
#pyOpenSSL==23.1.0
48-
python-editor==1.0.4
48+
# 202403: switch from python-editor to editor for py3.10 support
49+
editor==1.6.6
50+
# editor dependency, required here for inclusion in st2client setup.py
51+
pygments==2.17.2
4952
python-keyczar==0.716
5053
pytz==2024.1
5154
pywinrm==0.4.3
5255
pyyaml==6.0.1
53-
redis==5.0.3
56+
redis==5.0.4
5457
requests==2.31.0
5558
retrying==1.3.4
5659
routes==2.5.1
@@ -67,9 +70,9 @@ stevedore==5.2.0
6770
tenacity==8.2.3
6871
tooz==6.1.0
6972
# Note: virtualenv embeds wheels for pip, wheel, and setuptools. So pinning virtualenv pins those as well.
70-
# virtualenv==20.25.1 (<21) has pip==24.0 wheel==0.42.0 setuptools==68.0.0 and 69.1.0
73+
# virtualenv==20.26.0 (<21) has pip==24.0 wheel==0.43.0 setuptools==69.5.1
7174
# lockfiles/st2.lock has pip==24.0 wheel==0.43.0 setuptools==69.2.0
72-
virtualenv==20.25.3
75+
virtualenv==20.26.0
7376
webob==1.8.7
7477
zake==0.2.2
7578
# test requirements below

‎lockfiles/st2.lock‎

Lines changed: 113 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// "beautifulsoup4",
1717
// "ciso8601",
1818
// "cryptography",
19+
// "editor",
1920
// "eventlet",
2021
// "flask",
2122
// "flex",
@@ -45,15 +46,15 @@
4546
// "pip",
4647
// "prance",
4748
// "prettytable",
48-
// "prompt-toolkit<2",
49+
// "prompt-toolkit",
4950
// "psutil",
51+
// "pygments",
5052
// "pyinotify<=0.10,>=0.9.5; platform_system == \"Linux\"",
5153
// "pymongo<3.13.0,>=3.11.0",
5254
// "pyrabbit",
5355
// "pysocks",
5456
// "pytest",
5557
// "python-dateutil",
56-
// "python-editor",
5758
// "python-json-logger",
5859
// "python-statsd",
5960
// "pytz",
@@ -1073,6 +1074,27 @@
10731074
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7",
10741075
"version": "1.16.0"
10751076
},
1077+
{
1078+
"artifacts": [
1079+
{
1080+
"algorithm": "sha256",
1081+
"hash": "e818e6913f26c2a81eadef503a2741d7cca7f235d20e217274a009ecd5a74abf",
1082+
"url": "https://files.pythonhosted.org/packages/1b/c2/4bc8cd09b14e28ce3f406a8b05761bed0d785d1ca8c2a5c6684d884c66a2/editor-1.6.6-py3-none-any.whl"
1083+
},
1084+
{
1085+
"algorithm": "sha256",
1086+
"hash": "bb6989e872638cd119db9a4fce284cd8e13c553886a1c044c6b8d8a160c871f8",
1087+
"url": "https://files.pythonhosted.org/packages/2a/92/734a4ab345914259cb6146fd36512608ea42be16195375c379046f33283d/editor-1.6.6.tar.gz"
1088+
}
1089+
],
1090+
"project_name": "editor",
1091+
"requires_dists": [
1092+
"runs",
1093+
"xmod"
1094+
],
1095+
"requires_python": ">=3.8",
1096+
"version": "1.6.6"
1097+
},
10761098
{
10771099
"artifacts": [
10781100
{
@@ -2623,20 +2645,21 @@
26232645
"artifacts": [
26242646
{
26252647
"algorithm": "sha256",
2626-
"hash": "0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068",
2627-
"url": "https://files.pythonhosted.org/packages/55/72/4898c44ee9ea6f43396fbc23d9bfaf3d06e01b83698bdf2e4c919deceb7c/platformdirs-4.2.0-py3-none-any.whl"
2648+
"hash": "17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1",
2649+
"url": "https://files.pythonhosted.org/packages/b0/15/1691fa5aaddc0c4ea4901c26f6137c29d5f6673596fe960a0340e8c308e1/platformdirs-4.2.1-py3-none-any.whl"
26282650
},
26292651
{
26302652
"algorithm": "sha256",
2631-
"hash": "ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768",
2632-
"url": "https://files.pythonhosted.org/packages/96/dc/c1d911bf5bb0fdc58cc05010e9f3efe3b67970cef779ba7fbc3183b987a8/platformdirs-4.2.0.tar.gz"
2653+
"hash": "031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf",
2654+
"url": "https://files.pythonhosted.org/packages/b2/e4/2856bf61e54d7e3a03dd00d0c1b5fa86e6081e8f262eb91befbe64d20937/platformdirs-4.2.1.tar.gz"
26332655
}
26342656
],
26352657
"project_name": "platformdirs",
26362658
"requires_dists": [
26372659
"appdirs==1.4.4; extra == \"test\"",
26382660
"covdefaults>=2.3; extra == \"test\"",
26392661
"furo>=2023.9.10; extra == \"docs\"",
2662+
"mypy>=1.8; extra == \"type\"",
26402663
"proselint>=0.13; extra == \"docs\"",
26412664
"pytest-cov>=4.1; extra == \"test\"",
26422665
"pytest-mock>=3.12; extra == \"test\"",
@@ -2645,19 +2668,19 @@
26452668
"sphinx>=7.2.6; extra == \"docs\""
26462669
],
26472670
"requires_python": ">=3.8",
2648-
"version": "4.2.0"
2671+
"version": "4.2.1"
26492672
},
26502673
{
26512674
"artifacts": [
26522675
{
26532676
"algorithm": "sha256",
2654-
"hash": "7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981",
2655-
"url": "https://files.pythonhosted.org/packages/a5/5b/0cc789b59e8cc1bf288b38111d002d8c5917123194d45b29dcdac64723cc/pluggy-1.4.0-py3-none-any.whl"
2677+
"hash": "44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669",
2678+
"url": "https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl"
26562679
},
26572680
{
26582681
"algorithm": "sha256",
2659-
"hash": "8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be",
2660-
"url": "https://files.pythonhosted.org/packages/54/c6/43f9d44d92aed815e781ca25ba8c174257e27253a94630d21be8725a2b59/pluggy-1.4.0.tar.gz"
2682+
"hash": "2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1",
2683+
"url": "https://files.pythonhosted.org/packages/96/2d/02d4312c973c6050a18b314a5ad0b3210edb65a906f868e31c111dede4a6/pluggy-1.5.0.tar.gz"
26612684
}
26622685
],
26632686
"project_name": "pluggy",
@@ -2668,7 +2691,7 @@
26682691
"tox; extra == \"dev\""
26692692
],
26702693
"requires_python": ">=3.8",
2671-
"version": "1.4.0"
2694+
"version": "1.5.0"
26722695
},
26732696
{
26742697
"artifacts": [
@@ -2750,22 +2773,21 @@
27502773
"artifacts": [
27512774
{
27522775
"algorithm": "sha256",
2753-
"hash": "37925b37a4af1f6448c76b7606e0285f79f434ad246dda007a27411cca730c6d",
2754-
"url": "https://files.pythonhosted.org/packages/64/27/5fd61a451d086ad4aa806dc72fe1383d2bc0e74323668672287f616d5d51/prompt_toolkit-1.0.18-py3-none-any.whl"
2776+
"hash": "a11a29cb3bf0a28a387fe5122cdb649816a957cd9261dcedf8c9f1fef33eacf6",
2777+
"url": "https://files.pythonhosted.org/packages/ee/fd/ca7bf3869e7caa7a037e23078539467b433a4e01eebd93f77180ab927766/prompt_toolkit-3.0.43-py3-none-any.whl"
27552778
},
27562779
{
27572780
"algorithm": "sha256",
2758-
"hash": "dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126",
2759-
"url": "https://files.pythonhosted.org/packages/c5/64/c170e5b1913b540bf0c8ab7676b21fdd1d25b65ddeb10025c6ca43cccd4c/prompt_toolkit-1.0.18.tar.gz"
2781+
"hash": "3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d",
2782+
"url": "https://files.pythonhosted.org/packages/cc/c6/25b6a3d5cd295304de1e32c9edbcf319a52e965b339629d37d42bb7126ca/prompt_toolkit-3.0.43.tar.gz"
27602783
}
27612784
],
27622785
"project_name": "prompt-toolkit",
27632786
"requires_dists": [
2764-
"six>=1.9.0",
27652787
"wcwidth"
27662788
],
2767-
"requires_python": null,
2768-
"version": "1.0.18"
2789+
"requires_python": ">=3.7.0",
2790+
"version": "3.0.43"
27692791
},
27702792
{
27712793
"artifacts": [
@@ -2862,6 +2884,27 @@
28622884
"requires_python": ">=3.8",
28632885
"version": "2.22"
28642886
},
2887+
{
2888+
"artifacts": [
2889+
{
2890+
"algorithm": "sha256",
2891+
"hash": "b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c",
2892+
"url": "https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl"
2893+
},
2894+
{
2895+
"algorithm": "sha256",
2896+
"hash": "da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367",
2897+
"url": "https://files.pythonhosted.org/packages/55/59/8bccf4157baf25e4aa5a0bb7fa3ba8600907de105ebc22b0c78cfbf6f565/pygments-2.17.2.tar.gz"
2898+
}
2899+
],
2900+
"project_name": "pygments",
2901+
"requires_dists": [
2902+
"colorama>=0.4.6; extra == \"windows-terminal\"",
2903+
"importlib-metadata; python_version < \"3.8\" and extra == \"plugins\""
2904+
],
2905+
"requires_python": ">=3.7",
2906+
"version": "2.17.2"
2907+
},
28652908
{
28662909
"artifacts": [
28672910
{
@@ -3291,24 +3334,6 @@
32913334
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7",
32923335
"version": "2.9.0.post0"
32933336
},
3294-
{
3295-
"artifacts": [
3296-
{
3297-
"algorithm": "sha256",
3298-
"hash": "1bf6e860a8ad52a14c3ee1252d5dc25b2030618ed80c022598f00176adc8367d",
3299-
"url": "https://files.pythonhosted.org/packages/c6/d3/201fc3abe391bbae6606e6f1d598c15d367033332bd54352b12f35513717/python_editor-1.0.4-py3-none-any.whl"
3300-
},
3301-
{
3302-
"algorithm": "sha256",
3303-
"hash": "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b",
3304-
"url": "https://files.pythonhosted.org/packages/0a/85/78f4a216d28343a67b7397c99825cff336330893f00601443f7c7b2f2234/python-editor-1.0.4.tar.gz"
3305-
}
3306-
],
3307-
"project_name": "python-editor",
3308-
"requires_dists": [],
3309-
"requires_python": null,
3310-
"version": "1.0.4"
3311-
},
33123337
{
33133338
"artifacts": [
33143339
{
@@ -3498,13 +3523,13 @@
34983523
"artifacts": [
34993524
{
35003525
"algorithm": "sha256",
3501-
"hash": "5da9b8fe9e1254293756c16c008e8620b3d15fcc6dde6babde9541850e72a32d",
3502-
"url": "https://files.pythonhosted.org/packages/bb/f1/a384c5582d9a28e4a02eb1a2c279668053dd09aafeb08d2bd4dd323fc466/redis-5.0.3-py3-none-any.whl"
3526+
"hash": "7adc2835c7a9b5033b7ad8f8918d09b7344188228809c98df07af226d39dec91",
3527+
"url": "https://files.pythonhosted.org/packages/65/f2/540ad07910732733138beb192991c67c69e7f6ebf549ce1a3a77846cbae7/redis-5.0.4-py3-none-any.whl"
35033528
},
35043529
{
35053530
"algorithm": "sha256",
3506-
"hash": "4973bae7444c0fbed64a06b87446f79361cb7e4ec1538c022d696ed7a5015580",
3507-
"url": "https://files.pythonhosted.org/packages/eb/fc/8e822fd1e0a023c5ff80ca8c469b1d854c905ebb526ba38a90e7487c9897/redis-5.0.3.tar.gz"
3531+
"hash": "ec31f2ed9675cc54c21ba854cfe0462e6faf1d83c8ce5944709db8a4700b9c61",
3532+
"url": "https://files.pythonhosted.org/packages/cd/9c/1d57b0f61402aabdd9c3b2882e3fddd86a269c1df2cfd2e77daa607ef047/redis-5.0.4.tar.gz"
35083533
}
35093534
],
35103535
"project_name": "redis",
@@ -3518,7 +3543,7 @@
35183543
"typing-extensions; python_version < \"3.8\""
35193544
],
35203545
"requires_python": ">=3.7",
3521-
"version": "5.0.3"
3546+
"version": "5.0.4"
35223547
},
35233548
{
35243549
"artifacts": [
@@ -3764,6 +3789,26 @@
37643789
"requires_python": ">=3.6",
37653790
"version": "0.2.8"
37663791
},
3792+
{
3793+
"artifacts": [
3794+
{
3795+
"algorithm": "sha256",
3796+
"hash": "0980dcbc25aba1505f307ac4f0e9e92cbd0be2a15a1e983ee86c24c87b839dfd",
3797+
"url": "https://files.pythonhosted.org/packages/86/d6/17caf2e4af1dec288477a0cbbe4a96fbc9b8a28457dce3f1f452630ce216/runs-1.2.2-py3-none-any.whl"
3798+
},
3799+
{
3800+
"algorithm": "sha256",
3801+
"hash": "9dc1815e2895cfb3a48317b173b9f1eac9ba5549b36a847b5cc60c3bf82ecef1",
3802+
"url": "https://files.pythonhosted.org/packages/26/6d/b9aace390f62db5d7d2c77eafce3d42774f27f1829d24fa9b6f598b3ef71/runs-1.2.2.tar.gz"
3803+
}
3804+
],
3805+
"project_name": "runs",
3806+
"requires_dists": [
3807+
"xmod"
3808+
],
3809+
"requires_python": ">=3.8",
3810+
"version": "1.2.2"
3811+
},
37673812
{
37683813
"artifacts": [
37693814
{
@@ -4509,13 +4554,13 @@
45094554
"artifacts": [
45104555
{
45114556
"algorithm": "sha256",
4512-
"hash": "8aac4332f2ea6ef519c648d0bc48a5b1d324994753519919bddbb1aff25a104e",
4513-
"url": "https://files.pythonhosted.org/packages/cd/8a/709e9994dc2f9705d1127c63b64151582655e02c953e163b317803864fc0/virtualenv-20.25.3-py3-none-any.whl"
4557+
"hash": "0846377ea76e818daaa3e00a4365c018bc3ac9760cbb3544de542885aad61fb3",
4558+
"url": "https://files.pythonhosted.org/packages/fa/80/4230da6f5898d50c427591d81c4ca154c19ff3ea789266affcd9a770ed3d/virtualenv-20.26.0-py3-none-any.whl"
45144559
},
45154560
{
45164561
"algorithm": "sha256",
4517-
"hash": "7bb554bbdfeaacc3349fa614ea5bff6ac300fc7c335e9facf3a3bcfc703f45be",
4518-
"url": "https://files.pythonhosted.org/packages/42/28/846fb3eb75955d191f13bca658fb0082ddcef8e2d4b6fd0c76146556f0be/virtualenv-20.25.3.tar.gz"
4562+
"hash": "ec25a9671a5102c8d2657f62792a27b48f016664c6873f6beed3800008577210",
4563+
"url": "https://files.pythonhosted.org/packages/d8/02/0737e7aca2f7df4a7e4bfcd4de73aaad3ae6465da0940b77d222b753b474/virtualenv-20.26.0.tar.gz"
45194564
}
45204565
],
45214566
"project_name": "virtualenv",
@@ -4545,7 +4590,7 @@
45454590
"towncrier>=23.6; extra == \"docs\""
45464591
],
45474592
"requires_python": ">=3.7",
4548-
"version": "20.25.3"
4593+
"version": "20.26.0"
45494594
},
45504595
{
45514596
"artifacts": [
@@ -4823,6 +4868,24 @@
48234868
"requires_python": ">=3.4",
48244869
"version": "0.13.0"
48254870
},
4871+
{
4872+
"artifacts": [
4873+
{
4874+
"algorithm": "sha256",
4875+
"hash": "a24e9458a4853489042522bdca9e50ee2eac5ab75c809a91150a8a7f40670d48",
4876+
"url": "https://files.pythonhosted.org/packages/33/6b/0dc75b64a764ea1cb8e4c32d1fb273c147304d4e5483cd58be482dc62e45/xmod-1.8.1-py3-none-any.whl"
4877+
},
4878+
{
4879+
"algorithm": "sha256",
4880+
"hash": "38c76486b9d672c546d57d8035df0beb7f4a9b088bc3fb2de5431ae821444377",
4881+
"url": "https://files.pythonhosted.org/packages/72/b2/e3edc608823348e628a919e1d7129e641997afadd946febdd704aecc5881/xmod-1.8.1.tar.gz"
4882+
}
4883+
],
4884+
"project_name": "xmod",
4885+
"requires_dists": [],
4886+
"requires_python": ">=3.8",
4887+
"version": "1.8.1"
4888+
},
48264889
{
48274890
"artifacts": [
48284891
{
@@ -5004,6 +5067,7 @@
50045067
"beautifulsoup4",
50055068
"ciso8601",
50065069
"cryptography",
5070+
"editor",
50075071
"eventlet",
50085072
"flask",
50095073
"flex",
@@ -5033,15 +5097,15 @@
50335097
"pip",
50345098
"prance",
50355099
"prettytable",
5036-
"prompt-toolkit<2",
5100+
"prompt-toolkit",
50375101
"psutil",
5102+
"pygments",
50385103
"pyinotify<=0.10,>=0.9.5; platform_system == \"Linux\"",
50395104
"pymongo<3.13.0,>=3.11.0",
50405105
"pyrabbit",
50415106
"pysocks",
50425107
"pytest",
50435108
"python-dateutil",
5044-
"python-editor",
50455109
"python-json-logger",
50465110
"python-statsd",
50475111
"pytz",

0 commit comments

Comments
 (0)