From 40754ec6e7f3374656d8f033f2f7a7f05fec2540 Mon Sep 17 00:00:00 2001
From: Bryna Hazelton <bryna.hazelton@gmail.com>
Date: Fri, 21 Jul 2023 13:49:22 +0800
Subject: [PATCH] Use the standard test environment on python 3.11

---
 .github/workflows/testsuite.yaml | 12 +-----------
 ci/pyuvsim_tests_311.yaml        | 25 -------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 ci/pyuvsim_tests_311.yaml

diff --git a/.github/workflows/testsuite.yaml b/.github/workflows/testsuite.yaml
index cd52813e..177c297d 100644
--- a/.github/workflows/testsuite.yaml
+++ b/.github/workflows/testsuite.yaml
@@ -8,7 +8,7 @@ concurrency:
 jobs:
   tests:
     env:
-      # ENV_NAME: pyuvsim_tests
+      ENV_NAME: pyuvsim_tests
       PYTHON: ${{ matrix.python-version }}
       OS: ${{ matrix.os }}
     name: Testing
@@ -27,16 +27,6 @@ jobs:
         with:
           fetch-depth: 1
 
-      # This is required becasue we're temporarily using a different env
-      # (without casacore) for python 3.11 jobs
-      - name: Set env_name variable
-        run: |
-          if [ ${{ env.PYTHON }} != '3.11' ]; then
-            echo "ENV_NAME=pyuvsim_tests" >> "$GITHUB_ENV"
-          else
-            echo "ENV_NAME=pyuvsim_tests_311" >> "$GITHUB_ENV"
-          fi
-
       - name: Setup Minimamba
         uses: conda-incubator/setup-miniconda@v2
         with:
diff --git a/ci/pyuvsim_tests_311.yaml b/ci/pyuvsim_tests_311.yaml
deleted file mode 100644
index e32dd037..00000000
--- a/ci/pyuvsim_tests_311.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: pyuvsim_tests_311
-channels:
-  - conda-forge
-dependencies:
-  - astropy>=5.2
-  - astropy-healpix>=0.6
-  - coverage
-  - line_profiler
-  - mpi4py>=3.0.0
-  - numpy>=1.20
-  - pip
-  - psutil
-  # leave out python-casacore for python 3.11 tests because it has a conflict with
-  # the newest h5py, which we need to avoid numpy deprecation warnings.
-  # - python-casacore>=3.3
-  - pytest
-  - pytest-cov
-  - pyuvdata>=2.2.10
-  - pyyaml>=5.1
-  - scipy>=1.3
-  - setuptools_scm>=7.0.3
-  - pip:
-    - pyradiosky>=0.2
-    - lunarsky>=0.2.1
-    - git+https://github.com/aelanman/analytic_diffuse