From 1094d73956ef1c172d40ee572ef96c3919142987 Mon Sep 17 00:00:00 2001 From: Aaron David Schneider Date: Wed, 25 Oct 2023 11:31:43 +0200 Subject: [PATCH] extra pip install --- .github/workflows/ci.yml | 4 +++- ci/environment-3.10.yml | 6 ------ ci/environment-3.8.yml | 25 ------------------------- ci/environment-3.9.yml | 8 +------- ci/environment-xarraymaster.yml | 4 ---- 5 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 ci/environment-3.8.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5636bb..dbb1c1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu-latest" ] - python-version: [ "3.8", "3.9", "3.10" ] + python-version: [ "3.9", "3.10" ] steps: - uses: actions/checkout@v2 - name: Cache conda @@ -43,6 +43,7 @@ jobs: - name: Set up conda environment shell: bash -l {0} run: | + python -m pip install git+https://github.com/MITgcm/xmitgcm.git miepython petitRADTRANS==2.4.9 prt-phasecurve python -m pip install -e . conda list - name: Run Tests @@ -77,6 +78,7 @@ jobs: - name: Set up conda environment shell: bash -l {0} run: | + python -m pip install git+https://github.com/MITgcm/xmitgcm.git miepython petitRADTRANS==2.4.9 prt-phasecurve python -m pip install -e . conda list - name: Run Tests diff --git a/ci/environment-3.10.yml b/ci/environment-3.10.yml index bd6f042..ee4ca59 100644 --- a/ci/environment-3.10.yml +++ b/ci/environment-3.10.yml @@ -18,9 +18,3 @@ dependencies: - pandas>2.0.3 - numba>=0.58.0 - llvmlite>=0.41.0 - - pip - - pip: - - git+https://github.com/MITgcm/xmitgcm.git - - miepython - - petitRADTRANS==2.4.9 - - prt-phasecurve diff --git a/ci/environment-3.8.yml b/ci/environment-3.8.yml deleted file mode 100644 index 49a4d39..0000000 --- a/ci/environment-3.8.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: test_env -channels: - - conda-forge -dependencies: - - python=3.8 - - cubedsphere - - pytest - - codecov - - pytest-cov - - h5py - - matplotlib - - astropy - - numpy - - scipy - - setuptools - - netcdf4 - - pandas>2.0.3 - - numba>=0.58.0 - - llvmlite>=0.41.0 - - pip - - pip: - - git+https://github.com/MITgcm/xmitgcm.git - - miepython - - petitRADTRANS==2.4.9 - - prt-phasecurve diff --git a/ci/environment-3.9.yml b/ci/environment-3.9.yml index 5c2478f..e31759a 100644 --- a/ci/environment-3.9.yml +++ b/ci/environment-3.9.yml @@ -17,10 +17,4 @@ dependencies: - pandas>2.0.3 - numba>=0.58.0 - llvmlite>=0.41.0 - - pip - - pip: - - git+https://github.com/MITgcm/xmitgcm.git - - miepython - - petitRADTRANS==2.4.9 - - prt-phasecurve - + - pip \ No newline at end of file diff --git a/ci/environment-xarraymaster.yml b/ci/environment-xarraymaster.yml index 018e66e..0e95c91 100644 --- a/ci/environment-xarraymaster.yml +++ b/ci/environment-xarraymaster.yml @@ -19,8 +19,4 @@ dependencies: - llvmlite>=0.41.0 - pip - pip: - - git+https://github.com/MITgcm/xmitgcm.git - git+https://github.com/pydata/xarray.git - - miepython - - petitRADTRANS==2.4.9 - - prt-phasecurve \ No newline at end of file