Skip to content

Commit 17613f2

Browse files
committed
Move dev dependency specification to environment.yml
Delete the requirements-dev.txt file, and update the ci_test.yml to install GMT dependencies directly from environment.yml.
1 parent dfd2bda commit 17613f2

File tree

4 files changed

+4
-30
lines changed

4 files changed

+4
-30
lines changed

.github/workflows/ci_tests.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,7 @@ jobs:
5959
# Install GMT and other required dependencies from conda-forge
6060
- name: Install GMT and required dependencies
6161
shell: bash -l {0}
62-
run: |
63-
requirements_file=full-conda-requirements.txt
64-
cat requirements.txt requirements-dev.txt > $requirements_file
65-
cat << EOF >> $requirements_file
66-
gmt=6.1.1
67-
make
68-
codecov
69-
EOF
70-
conda install --yes --file $requirements_file
62+
run: conda install --yes --file environment.yml
7163

7264
# Show installed pkg information for postmortem diagnostic
7365
- name: List installed packages

MAINTENANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The main advantages of this are:
4242

4343
We use GitHub Actions continuous integration (CI) services to
4444
build and test the project on Linux, macOS and Windows.
45-
They rely on the `requirements.txt` file to install required dependencies using
45+
They rely on the `environment.yml` file to install required dependencies using
4646
conda and the `Makefile` to run the tests and checks.
4747

4848
### GitHub Actions

environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- python=3.8
76
- pip
87
- gmt=6.1.1
98
- numpy
@@ -13,12 +12,14 @@ dependencies:
1312
- packaging
1413
- black
1514
- blackdoc
15+
- codecov
1616
- coverage[toml]
1717
- docformatter
1818
- flake8
1919
- ipython
2020
- isort>=5
2121
- jupyter
22+
- make
2223
- matplotlib
2324
- nbsphinx
2425
- pylint

requirements-dev.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)