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

Use GAMMAPY_DATA everywhere / remove GAMMAPY_EXTRA #2001

Merged
merged 12 commits into from Jan 25, 2019
Merged

Conversation

@Bultako
Copy link
Member

@Bultako Bultako commented Jan 23, 2019

This PR addresses issue #1889

  • The use of the env vars GAMMAPY_EXTRA, GAMMA_CAT and GAMMAPY_FERMI_LAT is no longer needed in Gammapy, neither in config files for CI or Docker/Binder and doc building.
  • All datasets used (tests, documentation and functionalities) are accessed through the single GAMMAPY_DATA env var.
  • The total size of datasets added to GAMMAPY_DATA represents ~ 10 MB, nearly all of them needed for testing, but also those present in the figures folder to insert images when the documentation building process.
  • Sphinx roles gp-extra-notebook and gp-extra-image have been replaced by gp-notebook and gp-image
  • The documentation has been updated according to modifs made.

Farewell GAMMAPY_EXTRA, welcome GAMMAPY_DATA.

@Bultako Bultako added the cleanup label Jan 23, 2019
@adonath adonath added this to the 0.10 milestone Jan 24, 2019
@adonath adonath self-assigned this Jan 24, 2019
@adonath
Copy link
Member

@adonath adonath commented Jan 24, 2019

Thanks @Bultako for working on this! Just a first minor comment: it seems there is some output of the tutorial notebooks committed. Can you please strip the output?

@Bultako Bultako force-pushed the Bultako:gp-extra branch from 9bd8931 to 38827e4 Jan 24, 2019
@adonath
Copy link
Member

@adonath adonath commented Jan 24, 2019

I checked your branch locally and all works fine! All tests and tutorials tests pass...

Before we can merge:

  • Because of #2000 and running black on the notebooks in this PR there is now a merge conflict in cta_sensitivity.ipynb that has to be resolved (let me know if I should help...).
  • When running gammapy download datatests it say at the end export GAMMAPY_DATA=/home/hfm/adonath/data/gammapy-data/gammapy-datasets/datasets, but the path should rather be export GAMMAPY_DATA=/home/hfm/adonath/data/gammapy-data/gammapy-datasets, you might want to fix this.
@adonath adonath self-requested a review Jan 24, 2019
@Bultako Bultako force-pushed the Bultako:gp-extra branch from 38827e4 to 0252a1b Jan 24, 2019
@Bultako
Copy link
Member Author

@Bultako Bultako commented Jan 24, 2019

@adonath

Because of #2000 and running black on the notebooks in this PR there is now a merge conflict in cta_sensitivity.ipynb that has to be resolved (let me know if I should help...).

Ok, it has been solved.

When running gammapy download datatests it say at the end export GAMMAPY_DATA=/home/hfm/adonath/data/gammapy-data/gammapy-datasets/datasets, but the path should rather be export GAMMAPY_DATA=/home/hfm/adonath/data/gammapy-data/gammapy-datasets, you might want to fix this.

This should be solved in #1988
You can try with that PR any gammapy download issue you may have.

@Bultako Bultako force-pushed the Bultako:gp-extra branch from 0252a1b to b24882e Jan 24, 2019
Copy link
Member

@adonath adonath left a comment

I have no further comments. It‘s ready to merge from my side.

@cdeil cdeil changed the title Removing GAMMAPY_EXTRA from code base Use GAMMAPY_DATA everywhere / remove GAMMAPY_EXTRA Jan 25, 2019
@Bultako Bultako force-pushed the Bultako:gp-extra branch from b24882e to de08ba8 Jan 25, 2019
@cdeil cdeil assigned Bultako and unassigned adonath Jan 25, 2019
@Bultako Bultako force-pushed the Bultako:gp-extra branch from de08ba8 to 413cc39 Jan 25, 2019
@Bultako Bultako merged commit f35d880 into gammapy:master Jan 25, 2019
4 checks passed
4 checks passed
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
Scrutinizer Analysis: 6 updated code elements – Tests: passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
gammapy.gammapy Build #20190125.7 succeeded
Details
@Bultako Bultako deleted the Bultako:gp-extra branch Jan 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants