Skip to content

Commit

Permalink
Move dev dependency specification to environment.yml
Browse files Browse the repository at this point in the history
Delete the requirements-dev.txt file, and update the ci_test.yml to install GMT dependencies while setting up mamba.
  • Loading branch information
weiji14 committed Feb 6, 2021
1 parent 79cd804 commit 5612a68
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 36 deletions.
19 changes: 4 additions & 15 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,28 +79,17 @@ jobs:
# fecth all history so that setuptools-scm works
fetch-depth: 0

# Setup Miniconda
- name: Setup Miniconda
# Install Mambaforge with GMT and other conda-forge dependencies
- name: Setup Mambaforge with GMT and required dependencies
uses: conda-incubator/setup-miniconda@2fc91a2ef82dfb50ded2d80e56f83b7039ba5955
with:
python-version: ${{ matrix.python-version }}
environment-file: environment.yml
miniforge-variant: Mambaforge
miniforge-version: latest
mamba-version: "*"
use-mamba: true

# Install GMT and other required dependencies from conda-forge
- name: Install GMT and required dependencies
shell: bash -l {0}
run: |
requirements_file=full-conda-requirements.txt
cat requirements.txt requirements-dev.txt > $requirements_file
cat << EOF >> $requirements_file
gmt=6.1.1
make
codecov
EOF
mamba install --yes --file $requirements_file
# Show installed pkg information for postmortem diagnostic
- name: List installed packages
shell: bash -l {0}
Expand Down
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.8
- pip
- gmt=6.1.1
- numpy
Expand All @@ -13,12 +12,14 @@ dependencies:
- packaging
- black
- blackdoc
- codecov
- coverage[toml]
- docformatter
- flake8
- ipython
- isort>=5
- jupyter
- make
- matplotlib
- nbsphinx
- pylint
Expand Down
19 changes: 0 additions & 19 deletions requirements-dev.txt

This file was deleted.

1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Requirements for installing with conda
numpy
pandas
xarray
Expand Down

0 comments on commit 5612a68

Please sign in to comment.