Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate the synthetic and dataset modules #380

Merged
merged 24 commits into from
Feb 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bea3c06
Deprecate the synthetic module
santisoler Feb 24, 2023
70fb5f1
Ditch datasets module
santisoler Feb 24, 2023
11615de
Replace harmonica.datasets for ensaio in examples
santisoler Feb 24, 2023
3dbc855
Mention ensaio on installation instructions
santisoler Feb 24, 2023
92b06d2
Remove data/examples from Sphinx's conf.py
santisoler Feb 24, 2023
291651b
Remove HARMONICA_CACHE_DIR in GitHub Action
santisoler Feb 25, 2023
e9d8e8e
Remove pooch as a Harmonica dependency
santisoler Feb 27, 2023
e53900e
Pin Ensaio to 0.5.*
santisoler Feb 27, 2023
cc714b2
Run mamba search ensaio before installing requirements
santisoler Feb 27, 2023
946ff8f
Specify mamba version and show mamba list before installing dependente
santisoler Feb 27, 2023
d04b602
Comment out using Mambaforge, will fallback to default
santisoler Feb 27, 2023
76969dd
Keep using Mambaforge and auto-update conda
santisoler Feb 27, 2023
624ddfa
Disable mamba entirely, fallback to defaults
santisoler Feb 27, 2023
96f582b
Disable use-only-tar-bz2
santisoler Feb 27, 2023
72f091c
Remove added verbosity on docs.yml Action
santisoler Feb 27, 2023
8347ce6
Fix typo
santisoler Feb 27, 2023
f397567
Merge branch 'main' into deprecate-synthetic
santisoler Feb 27, 2023
fa27e93
Run make format
santisoler Feb 27, 2023
9eeb9b6
Use the same pinning for ensaio as the one in main
santisoler Feb 27, 2023
5b16996
Merge branch 'main' into deprecate-synthetic
santisoler Feb 28, 2023
27b53d3
Restore data dir in MANIFEST.in
santisoler Feb 28, 2023
27044ee
Merge branch 'main' into deprecate-synthetic
santisoler Feb 28, 2023
903f43d
Remove sample_data dir from Sphinx conf.py
santisoler Feb 28, 2023
024e42c
Remove references to removed sample data
santisoler Feb 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,29 +138,15 @@ jobs:
- name: List installed packages
run: python -m pip freeze

- name: Copy test data to cache
run: |
echo "Copy data to " $HARMONICA_DATA_DIR/main
set -x -e
mkdir -p $HARMONICA_DATA_DIR/main
cp -r data/* $HARMONICA_DATA_DIR/main
env:
# Define directory where sample data will be copied
HARMONICA_DATA_DIR: ${{ runner.temp }}/cache/harmonica

- name: Run the tests
run: |
ls $HARMONICA_DATA_DIR
if [ ${{ matrix.os }} == 'ubuntu' ]; then
# Set NUMBA_THREADING_LAYER to workqueue on Ubuntu to prevent
# endless loop on some test functions that make use of Numba
NUMBA_THREADING_LAYER=workqueue make test
else
make test
fi
env:
# Define directory where sample data will be copied
HARMONICA_DATA_DIR: ${{ runner.temp }}/cache/harmonica

- name: Convert coverage report to XML for codecov
run: coverage xml
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PROJECT=harmonica
TESTDIR=tmp-test-dir-with-unique-name
PYTEST_ARGS=--cov-config=../.coveragerc --cov-report=term-missing --cov=$(PROJECT) --doctest-modules -v --pyargs
NUMBATEST_ARGS=--doctest-modules -v --pyargs -m use_numba
STYLE_CHECK_FILES=$(PROJECT) examples data/examples doc/conf.py tools
STYLE_CHECK_FILES=$(PROJECT) examples doc/conf.py tools

help:
@echo "Commands:"
Expand Down
33 changes: 0 additions & 33 deletions data/README.md

This file was deleted.

Binary file removed data/britain-magnetic.csv.xz
Binary file not shown.
Binary file removed data/etopo1-0.5deg.nc.xz
Binary file not shown.
32 changes: 0 additions & 32 deletions data/examples/README.txt

This file was deleted.

71 changes: 0 additions & 71 deletions data/examples/britain_magnetic.py

This file was deleted.

44 changes: 0 additions & 44 deletions data/examples/earth_geoid.py

This file was deleted.

41 changes: 0 additions & 41 deletions data/examples/earth_gravity.py

This file was deleted.

41 changes: 0 additions & 41 deletions data/examples/earth_topography.py

This file was deleted.

55 changes: 0 additions & 55 deletions data/examples/south_africa_gravity.py

This file was deleted.

Loading