From 6611609356875757ffe5a0a702725c1d7a24af52 Mon Sep 17 00:00:00 2001 From: Ayush Dattagupta Date: Mon, 11 Apr 2022 19:12:03 -0700 Subject: [PATCH 1/2] Set max pin on antlr4-python-runtime due to incompatibilities with fugue_sql --- continuous_integration/environment-3.10-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.10-jdk8-dev.yaml | 2 +- continuous_integration/environment-3.8-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.8-jdk8-dev.yaml | 2 +- continuous_integration/environment-3.9-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.9-jdk8-dev.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml index 257b33703..4e75f37e9 100644 --- a/continuous_integration/environment-3.10-jdk11-dev.yaml +++ b/continuous_integration/environment-3.10-jdk11-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2 +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml index 399aeb53d..b8f15566d 100644 --- a/continuous_integration/environment-3.10-jdk8-dev.yaml +++ b/continuous_integration/environment-3.10-jdk8-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2 +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.8-jdk11-dev.yaml b/continuous_integration/environment-3.8-jdk11-dev.yaml index 03968298a..059e1dd27 100644 --- a/continuous_integration/environment-3.8-jdk11-dev.yaml +++ b/continuous_integration/environment-3.8-jdk11-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2 +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.8-jdk8-dev.yaml b/continuous_integration/environment-3.8-jdk8-dev.yaml index 46c77c06a..604310ff0 100644 --- a/continuous_integration/environment-3.8-jdk8-dev.yaml +++ b/continuous_integration/environment-3.8-jdk8-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2 +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.9-jdk11-dev.yaml b/continuous_integration/environment-3.9-jdk11-dev.yaml index b3b2d0fa4..0a6ceb405 100644 --- a/continuous_integration/environment-3.9-jdk11-dev.yaml +++ b/continuous_integration/environment-3.9-jdk11-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2 +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.9-jdk8-dev.yaml b/continuous_integration/environment-3.9-jdk8-dev.yaml index 7afce7d05..3bad59e2f 100644 --- a/continuous_integration/environment-3.9-jdk8-dev.yaml +++ b/continuous_integration/environment-3.9-jdk8-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2 +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 From 5ed53a2c770d2a4dc042d62a8b2d8f4b98862cf5 Mon Sep 17 00:00:00 2001 From: Ayush Dattagupta Date: Tue, 12 Apr 2022 09:04:53 -0700 Subject: [PATCH 2/2] update comment on antlr max pin version --- continuous_integration/environment-3.10-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.10-jdk8-dev.yaml | 2 +- continuous_integration/environment-3.8-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.8-jdk8-dev.yaml | 2 +- continuous_integration/environment-3.9-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.9-jdk8-dev.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml index 4e75f37e9..14ab5c230 100644 --- a/continuous_integration/environment-3.10-jdk11-dev.yaml +++ b/continuous_integration/environment-3.10-jdk11-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Remove max pin after qpd(fugue dependency) updates their conda recipe - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml index b8f15566d..a80b4755e 100644 --- a/continuous_integration/environment-3.10-jdk8-dev.yaml +++ b/continuous_integration/environment-3.10-jdk8-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Remove max pin after qpd(fugue dependency) updates their conda recipe - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.8-jdk11-dev.yaml b/continuous_integration/environment-3.8-jdk11-dev.yaml index 059e1dd27..9071132dc 100644 --- a/continuous_integration/environment-3.8-jdk11-dev.yaml +++ b/continuous_integration/environment-3.8-jdk11-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Remove max pin after qpd(fugue dependency) updates their conda recipe - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.8-jdk8-dev.yaml b/continuous_integration/environment-3.8-jdk8-dev.yaml index 604310ff0..dff84a617 100644 --- a/continuous_integration/environment-3.8-jdk8-dev.yaml +++ b/continuous_integration/environment-3.8-jdk8-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Remove max pin after qpd(fugue dependency) updates their conda recipe - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.9-jdk11-dev.yaml b/continuous_integration/environment-3.9-jdk11-dev.yaml index 0a6ceb405..0cf3bbea6 100644 --- a/continuous_integration/environment-3.9-jdk11-dev.yaml +++ b/continuous_integration/environment-3.9-jdk11-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Remove max pin after qpd(fugue dependency) updates their conda recipe - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 diff --git a/continuous_integration/environment-3.9-jdk8-dev.yaml b/continuous_integration/environment-3.9-jdk8-dev.yaml index 3bad59e2f..52870e1e9 100644 --- a/continuous_integration/environment-3.9-jdk8-dev.yaml +++ b/continuous_integration/environment-3.9-jdk8-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - adagio>=0.2.3 -- antlr4-python3-runtime>=4.9.2, <4.10.0 # Max pin until https://github.com/fugue-project/fugue/issues/318 is resolved +- antlr4-python3-runtime>=4.9.2, <4.10.0 # Remove max pin after qpd(fugue dependency) updates their conda recipe - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22