Merge pull request #17 from gregstarr/develop

Develop
gregstarr · Jun 25, 2022 · ca2bff5 · ca2bff5
2 parents c8d7bb0 + 2427981
commit ca2bff5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git 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: |
@@ -42,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

diff --git 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
diff --git a/setup.py b/setup.py
@@ -9,10 +9,4 @@
     author='gregstarr',
     author_email='gregstarr2@gmail.com',
     description='',
-    install_requires=[
-        'numpy',
-        'scipy',
-        'appdirs',
-        'xarray'
-    ]
 )