From c1d8749d60235e28424b4fd8e822bf8d160a6c71 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sat, 8 Apr 2023 14:19:17 -0400 Subject: [PATCH 1/8] requirements: Use sharp inequality for bear type upper bound Signed-off-by: Jan Vesely --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3eded559e30..51c63b6e8c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,4 +18,4 @@ leabra-psyneulink<=0.3.2 rich>=10.1, <10.13 pandas<2.0.1 fastkde>=1.0.19, <1.0.21 -beartype<=0.12.0 \ No newline at end of file +beartype<0.13.0 From af8537c59ca9da9d98d44a8150f722eb8bee35bd Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sat, 8 Apr 2023 14:38:23 -0400 Subject: [PATCH 2/8] requirements: Fix dill dependency upper bound A coma separating minor and patch version was missed. Bump to <0.3.7 since we've been using the latest <0.36 for some time. Fixes: f137ee6c7d0 ("requirements: Add max working version of all dependencies") Signed-off-by: Jan Vesely --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 51c63b6e8c0..66211c25510 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ autograd<1.6 graph-scheduler>=0.2.0, <1.1.2 -dill<=0.32 +dill<0.3.7 elfi<0.8.7 graphviz<0.21.0 grpcio<1.43.0 From 37589704e1328b1b858688295e0b0626f7354157 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sat, 8 Apr 2023 14:49:42 -0400 Subject: [PATCH 3/8] requirements: Use sharp inequality for leabra-psyneulink upper bound Signed-off-by: Jan Vesely --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 66211c25510..b738f34f524 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pillow<9.6.0 pint<0.21.0 toposort<1.11 torch>=1.8.0, <1.14.0; (platform_machine == 'AMD64' or platform_machine == 'x86_64') and platform_python_implementation == 'CPython' and implementation_name == 'cpython' -leabra-psyneulink<=0.3.2 +leabra-psyneulink<0.3.3 rich>=10.1, <10.13 pandas<2.0.1 fastkde>=1.0.19, <1.0.21 From 30f7a4525f3e72c99982ea6d222c034897e2ee2f Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sat, 8 Apr 2023 14:51:20 -0400 Subject: [PATCH 4/8] requirements: Sort alphabetically Signed-off-by: Jan Vesely --- requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index b738f34f524..8accd8dc2ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,21 +1,21 @@ autograd<1.6 -graph-scheduler>=0.2.0, <1.1.2 +beartype<0.13.0 dill<0.3.7 elfi<0.8.7 +fastkde>=1.0.19, <1.0.21 +graph-scheduler>=0.2.0, <1.1.2 graphviz<0.21.0 grpcio<1.43.0 grpcio-tools<1.43.0 +leabra-psyneulink<0.3.3 llvmlite<0.40 matplotlib<3.7.2 modeci_mdf<0.5, >=0.3.4; (platform_machine == 'AMD64' or platform_machine == 'x86_64') and platform_python_implementation == 'CPython' and implementation_name == 'cpython' networkx<3.2 numpy<1.22.5, >=1.19.0 +pandas<2.0.1 pillow<9.6.0 pint<0.21.0 +rich>=10.1, <10.13 toposort<1.11 torch>=1.8.0, <1.14.0; (platform_machine == 'AMD64' or platform_machine == 'x86_64') and platform_python_implementation == 'CPython' and implementation_name == 'cpython' -leabra-psyneulink<0.3.3 -rich>=10.1, <10.13 -pandas<2.0.1 -fastkde>=1.0.19, <1.0.21 -beartype<0.13.0 From b679d301132e8ff0569340aeeab467ff09a0aa50 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sat, 8 Apr 2023 14:54:23 -0400 Subject: [PATCH 5/8] dev_requirements: Use sharp inequality of pytest-profiling upper bound Signed-off-by: Jan Vesely --- dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 22eabc22fc1..c491a0bb05b 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -4,7 +4,7 @@ pytest<7.2.3 pytest-benchmark<4.0.1 pytest-cov<4.0.1 pytest-helpers-namespace<2021.12.30 -pytest-profiling<=1.7.0 +pytest-profiling<1.7.1 pytest-pycodestyle<2.4.0 pytest-pydocstyle<2.4.0 pytest-xdist<3.3.0 From b57dfd4bdbaf15d0cf1186412090471bf43d8ea7 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sat, 8 Apr 2023 14:55:57 -0400 Subject: [PATCH 6/8] {dev,tutorial}_requirements: Use sharp inequality for jupyter upper bound Signed-off-by: Jan Vesely --- dev_requirements.txt | 2 +- tutorial_requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index c491a0bb05b..a771d143269 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,4 +1,4 @@ -jupyter<=1.0.0 +jupyter<1.0.1 packaging<24.0 pytest<7.2.3 pytest-benchmark<4.0.1 diff --git a/tutorial_requirements.txt b/tutorial_requirements.txt index 519405de722..c74d2c414ef 100644 --- a/tutorial_requirements.txt +++ b/tutorial_requirements.txt @@ -1,3 +1,3 @@ graphviz<0.21.0 -jupyter<=1.0.0 +jupyter<1.0.1 matplotlib<3.7.2 From 5a25795589f7201aa1c53bc986709e01b72ce545 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sat, 8 Apr 2023 17:28:35 -0400 Subject: [PATCH 7/8] requirements: Add protobuf to dependency list Imported in core/rpc/graph_pb2.py Signed-off-by: Jan Vesely --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 8accd8dc2ee..d6e6f5e126d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,7 @@ numpy<1.22.5, >=1.19.0 pandas<2.0.1 pillow<9.6.0 pint<0.21.0 +protobuf<3.20.4 rich>=10.1, <10.13 toposort<1.11 torch>=1.8.0, <1.14.0; (platform_machine == 'AMD64' or platform_machine == 'x86_64') and platform_python_implementation == 'CPython' and implementation_name == 'cpython' From dfde3213174f462e81cdc888079b99378c1cfadf Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sat, 8 Apr 2023 16:32:45 -0400 Subject: [PATCH 8/8] requirements: Drop grpcio-tools Signed-off-by: Jan Vesely --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d6e6f5e126d..2c96d1ea849 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,6 @@ fastkde>=1.0.19, <1.0.21 graph-scheduler>=0.2.0, <1.1.2 graphviz<0.21.0 grpcio<1.43.0 -grpcio-tools<1.43.0 leabra-psyneulink<0.3.3 llvmlite<0.40 matplotlib<3.7.2