Skip to content

Instantly share code, notes, and snippets.

@cdeil
Created August 27, 2019 07:38
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save cdeil/47716c65ac6e3d2aa4370467dc3d57e0 to your computer and use it in GitHub Desktop.
Save cdeil/47716c65ac6e3d2aa4370467dc3d57e0 to your computer and use it in GitHub Desktop.
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
(gammapy-dev) hfm-1804a:gammapy2 deil$ git pull
remote: Enumerating objects: 85, done.
remote: Counting objects: 100% (85/85), done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 136 (delta 75), reused 74 (delta 72), pack-reused 51
Receiving objects: 100% (136/136), 22.58 KiB | 428.00 KiB/s, done.
Resolving deltas: 100% (99/99), completed with 34 local objects.
From https://github.com/gammapy/gammapy
7c77e21c8..e3524c519 master -> origin/master
Updating 7c77e21c8..e3524c519
warning: unable to rmdir 'astropy_helpers': Directory not empty
Fast-forward
.gitignore | 4 +-
.gitmodules | 3 -
.travis.yml | 88 ++++--------
MANIFEST.in | 7 +-
Makefile | 14 +-
ah_bootstrap.py | 1010 --------------------------------------------------------------------------------------------------------------------------------
astropy_helpers | 1 -
azure-pipelines.yml | 6 +-
docs/conf.py | 62 +-------
environment-dev.yml | 1 +
gammapy/__init__.py | 18 +--
gammapy/_astropy_init.py | 60 --------
gammapy/conftest.py | 5 -
gammapy/irf/setup_package.py | 7 -
gammapy/scripts/download.py | 18 ++-
gammapy/scripts/downloadclasses.py | 11 +-
gammapy/scripts/info.py | 8 +-
gammapy/scripts/main.py | 4 +-
gammapy/scripts/tests/test_main.py | 4 +-
gammapy/spectrum/flux_point.py | 13 +-
gammapy/spectrum/models.py | 6 +-
gammapy/spectrum/tests/test_flux_point.py | 2 +-
gammapy/spectrum/tests/test_models.py | 7 +
gammapy/tests/coveragerc | 2 -
gammapy/tests/setup_package.py | 6 -
gammapy/utils/docs.py | 8 +-
lgtm.yml | 2 -
setup.cfg | 96 ++++++++++---
setup.py | 165 +++------------------
29 files changed, 202 insertions(+), 1436 deletions(-)
delete mode 100644 ah_bootstrap.py
delete mode 160000 astropy_helpers
delete mode 100644 gammapy/_astropy_init.py
delete mode 100644 gammapy/irf/setup_package.py
delete mode 100644 gammapy/tests/setup_package.py
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
On branch master
Your branch is up to date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
astropy_helpers/
nothing added to commit but untracked files present (use "git add" to track)
(gammapy-dev) hfm-1804a:gammapy2 deil$ ls -lh .gitmodules
-rw-r--r-- 1 deil staff 0B Aug 27 09:34 .gitmodules
(gammapy-dev) hfm-1804a:gammapy2 deil$ git rm .gitmodules
rm '.gitmodules'
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
deleted: .gitmodules
Untracked files:
(use "git add <file>..." to include in what will be committed)
astropy_helpers/
(gammapy-dev) hfm-1804a:gammapy2 deil$ rm -r astropy_helpers/
(
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment