From c4f69785f6230a90c7911de92a2bac05736cd777 Mon Sep 17 00:00:00 2001
From: Greg Starr <gstarr@bu.edu>
Date: Sat, 25 Jun 2022 06:10:16 -0400
Subject: [PATCH 1/5] fixing ci setup issue

---
 .github/workflows/python-package-conda.yml | 5 -----
 environment.yml                            | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
index a8bfe6a..7f8c3ad 100644
--- a/.github/workflows/python-package-conda.yml
+++ b/.github/workflows/python-package-conda.yml
@@ -23,11 +23,6 @@ jobs:
     - name: Conda info
       shell: bash -l {0}
       run: conda info
-    - name: Finish python setup
-      shell: bash -l {0}
-      run: |
-        pip install apexpy
-        pip install --upgrade numpy
     - name: Lint with flake8
       shell: bash -l {0}
       run: |
diff --git a/environment.yml b/environment.yml
index 8b16646..44e94fb 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,7 +2,7 @@ channels:
   - anaconda
   - conda-forge
 dependencies:
-   - numpy==1.21.2
+   - numpy==1.22.4
    - scipy==1.7.3
    - h5py==3.6.0
    - scikit-image==0.19.1
@@ -16,3 +16,4 @@ dependencies:
    - pip
    - pip:
       - madrigalWeb==3.2
+      - apexpy

From b56470ddd41dea67515e81680c19c496146daf91 Mon Sep 17 00:00:00 2001
From: Greg Starr <gstarr@bu.edu>
Date: Sat, 25 Jun 2022 06:31:59 -0400
Subject: [PATCH 2/5] trying to fix ci setup issue

---
 .github/workflows/python-package-conda.yml | 5 +++++
 environment.yml                            | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
index 7f8c3ad..deb36aa 100644
--- a/.github/workflows/python-package-conda.yml
+++ b/.github/workflows/python-package-conda.yml
@@ -23,6 +23,11 @@ jobs:
     - name: Conda info
       shell: bash -l {0}
       run: conda info
+    - name: Finish python setup
+      shell: bash -l {0}
+      run: |
+        pip install apexpy
+        pip install --upgrade numpy==1.22.4
     - name: Lint with flake8
       shell: bash -l {0}
       run: |
diff --git a/environment.yml b/environment.yml
index 44e94fb..8b16646 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,7 +2,7 @@ channels:
   - anaconda
   - conda-forge
 dependencies:
-   - numpy==1.22.4
+   - numpy==1.21.2
    - scipy==1.7.3
    - h5py==3.6.0
    - scikit-image==0.19.1
@@ -16,4 +16,3 @@ dependencies:
    - pip
    - pip:
       - madrigalWeb==3.2
-      - apexpy

From 4731dc397ca68a6ae3da243b0c29ae548ab584c6 Mon Sep 17 00:00:00 2001
From: Greg Starr <gstarr@bu.edu>
Date: Sat, 25 Jun 2022 06:54:01 -0400
Subject: [PATCH 3/5] fgdsfdgdfgs

---
 .github/workflows/python-package-conda.yml | 3 +--
 environment.yml                            | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
index deb36aa..dd29256 100644
--- a/.github/workflows/python-package-conda.yml
+++ b/.github/workflows/python-package-conda.yml
@@ -26,8 +26,7 @@ jobs:
     - name: Finish python setup
       shell: bash -l {0}
       run: |
-        pip install apexpy
-        pip install --upgrade numpy==1.22.4
+        pip install --upgrade numpy
     - name: Lint with flake8
       shell: bash -l {0}
       run: |
diff --git a/environment.yml b/environment.yml
index 8b16646..1476477 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,7 +2,7 @@ channels:
   - anaconda
   - conda-forge
 dependencies:
-   - numpy==1.21.2
+   - numpy
    - scipy==1.7.3
    - h5py==3.6.0
    - scikit-image==0.19.1
@@ -16,3 +16,4 @@ dependencies:
    - pip
    - pip:
       - madrigalWeb==3.2
+      - apexpy

From 028c7926a8bff520db3654c09155f448bc25e9ef Mon Sep 17 00:00:00 2001
From: Greg Starr <gstarr@bu.edu>
Date: Sat, 25 Jun 2022 07:05:47 -0400
Subject: [PATCH 4/5] dyhdftdhfg

---
 .github/workflows/python-package-conda.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
index dd29256..e8836a0 100644
--- a/.github/workflows/python-package-conda.yml
+++ b/.github/workflows/python-package-conda.yml
@@ -23,10 +23,6 @@ jobs:
     - name: Conda info
       shell: bash -l {0}
       run: conda info
-    - name: Finish python setup
-      shell: bash -l {0}
-      run: |
-        pip install --upgrade numpy
     - name: Lint with flake8
       shell: bash -l {0}
       run: |
@@ -41,6 +37,7 @@ jobs:
         conda install pytest
         pip install pytest-html
         pip install pytest-cov
+        pip install --upgrade numpy
         pip install -e .
         pytest test --html=${{ matrix.python-version }}-results.html --self-contained-html --cov=./ --cov-report=xml
     - name: Move artifacts

From 2427981773d018d1eb8447717abe045c26c06834 Mon Sep 17 00:00:00 2001
From: Greg Starr <gstarr@bu.edu>
Date: Sat, 25 Jun 2022 07:15:21 -0400
Subject: [PATCH 5/5] asdfasdfasfd

---
 setup.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/setup.py b/setup.py
index 8a0b95f..3ac18b6 100644
--- a/setup.py
+++ b/setup.py
@@ -9,10 +9,4 @@
     author='gregstarr',
     author_email='gregstarr2@gmail.com',
     description='',
-    install_requires=[
-        'numpy',
-        'scipy',
-        'appdirs',
-        'xarray'
-    ]
 )