From e5b1fb2505c144a1c460426a577bf9f775a42c4b Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Thu, 25 Apr 2024 09:47:10 -0700 Subject: [PATCH 1/5] Updating redis package names to include python modules and server codes --- environment_python_3.10.yml | 4 ++-- environment_python_3.9.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment_python_3.10.yml b/environment_python_3.10.yml index e322ea9ca..fd81cbd6f 100644 --- a/environment_python_3.10.yml +++ b/environment_python_3.10.yml @@ -45,7 +45,8 @@ dependencies: - pytest-mock=3.11.1 - python=3.10.12 - pyyaml=6.0.1 - - redis=5.0.0 + - redis-py=5.0.0 + - redis-server=7.2.4 - ruff=0.0.292 - scipy=1.9.3 - setuptools=68.2.2 @@ -63,7 +64,6 @@ dependencies: - pysiaf==0.20.0 - pysqlite3==0.5.2 - pyvo==1.4.2 - - redis==5.0.0 - selenium==4.13.0 - stdatamodels==1.8.3 - stsci_rtd_theme==1.0.0 diff --git a/environment_python_3.9.yml b/environment_python_3.9.yml index a68f005c5..d806f012c 100644 --- a/environment_python_3.9.yml +++ b/environment_python_3.9.yml @@ -45,7 +45,8 @@ dependencies: - pytest-mock=3.11.1 - python=3.9.17 - pyyaml=6.0.1 - - redis=5.0.0 + - redis-py=5.0.0 + - redis-server=7.2.4 - ruff=0.0.292 - scipy=1.9.3 - setuptools=68.2.2 @@ -63,7 +64,6 @@ dependencies: - pysiaf==0.20.0 - pysqlite3==0.5.2 - pyvo==1.4.2 - - redis==5.0.0 - selenium==4.13.0 - stdatamodels==1.8.3 - stsci_rtd_theme==1.0.0 From 6c73d6d1df8a41cef641108edffaba13ccb5a576 Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Thu, 25 Apr 2024 09:56:18 -0700 Subject: [PATCH 2/5] Revert python 3.9 env since it will be deleted when 1515 is merged --- environment_python_3.9.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment_python_3.9.yml b/environment_python_3.9.yml index d806f012c..a68f005c5 100644 --- a/environment_python_3.9.yml +++ b/environment_python_3.9.yml @@ -45,8 +45,7 @@ dependencies: - pytest-mock=3.11.1 - python=3.9.17 - pyyaml=6.0.1 - - redis-py=5.0.0 - - redis-server=7.2.4 + - redis=5.0.0 - ruff=0.0.292 - scipy=1.9.3 - setuptools=68.2.2 @@ -64,6 +63,7 @@ dependencies: - pysiaf==0.20.0 - pysqlite3==0.5.2 - pyvo==1.4.2 + - redis==5.0.0 - selenium==4.13.0 - stdatamodels==1.8.3 - stsci_rtd_theme==1.0.0 From 4614c02ad9b9f396e3a321a8677573017bed1417 Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Thu, 25 Apr 2024 11:35:19 -0700 Subject: [PATCH 3/5] Updating conda command to mamba --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54147a822..be095ca80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - run: pip install -e .[test] - - run: conda env export + - run: mamba env export - uses: supercharge/redis-github-action@1.4.0 with: From 5eae7c6849417af7433abd2279ea68409ea94f06 Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Thu, 25 Apr 2024 12:44:25 -0700 Subject: [PATCH 4/5] remove conda export command to see if tests build --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24ec65eee..c9d6173d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,8 +43,6 @@ jobs: - run: pip install -e .[test] - - run: mamba env export - - uses: supercharge/redis-github-action@1.4.0 with: redis-version: 5.0 From 7cc7d060bbc6c6965124794a4837f81c800f55e5 Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Thu, 25 Apr 2024 13:27:23 -0700 Subject: [PATCH 5/5] try to export env with MICROmamba instead of mamba --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9d6173d4..b35747ba1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,6 +43,8 @@ jobs: - run: pip install -e .[test] + - run: micromamba env export + - uses: supercharge/redis-github-action@1.4.0 with: redis-version: 5.0