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

APE 17 migration #1674

Merged
merged 44 commits into from
Jul 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
cab1a55
remove ah submodule
epassaro Jun 28, 2021
3e5c353
re-render setup.cfg
epassaro Jun 28, 2021
e628a22
remove get_package_data functions
epassaro Jun 28, 2021
cbde465
remove ah submodule (2)
epassaro Jun 28, 2021
97ce24f
remove ez_setup.py
epassaro Jun 28, 2021
df7570c
re-render setup.py
epassaro Jun 28, 2021
6b8b9d3
update pyproject.toml
epassaro Jun 28, 2021
31a81c0
re-render .gitignore
epassaro Jun 28, 2021
3382c0e
re-render MANIFEST.in
epassaro Jun 28, 2021
488c52e
add tox.ini
epassaro Jun 28, 2021
babc73c
re-render _astropy_init.py
epassaro Jun 28, 2021
783ee8a
update __init__.py
epassaro Jun 28, 2021
f5d849d
update conftest.py
epassaro Jun 28, 2021
5f4b084
add licenses folder
epassaro Jun 28, 2021
923455f
add license section to readme
epassaro Jun 28, 2021
812b1f1
re-render docs cfg
epassaro Jun 28, 2021
51bc363
comment out __githash__ imports
epassaro Jun 28, 2021
ea3b3d3
remove plasma setup_package.py
epassaro Jun 28, 2021
18265e8
disable doctests
epassaro Jun 28, 2021
ef4ec8d
re apply black format
epassaro Jun 28, 2021
4357e3f
fix author name
epassaro Jun 28, 2021
de41ff0
add required dependency
epassaro Jun 28, 2021
a06580d
first round of changes to conf.py
epassaro Jun 28, 2021
8a07b7f
add jaladh changes to conf.py
epassaro Jun 28, 2021
82bbdb9
changes to doc workflows [build_docs]
epassaro Jun 28, 2021
c507350
add atharva patch
epassaro Jun 28, 2021
e27679c
fix layout
epassaro Jun 29, 2021
282a5bc
include package data [build_docs]
epassaro Jun 29, 2021
68289f5
add missing nbsphinx config
epassaro Jun 29, 2021
3bda96c
more changes to conf.py [build_docs]
epassaro Jun 29, 2021
f529e93
minor changes
epassaro Jun 29, 2021
1d93392
add entry points
epassaro Jun 29, 2021
a1915c5
black format script
epassaro Jun 29, 2021
167421f
minor changes
epassaro Jun 29, 2021
368e342
add support for CalVer :)
epassaro Jun 29, 2021
b5b4a4e
comment out calver cfg
epassaro Jun 29, 2021
04a18a6
fix typo
epassaro Jun 29, 2021
47e62d0
minor changes
epassaro Jun 30, 2021
62724df
consistent use of quotes in conf.py
epassaro Jul 1, 2021
4af2443
fix copyright [build_docs]
epassaro Jul 1, 2021
c748096
remove obsolete .nojekyll from docs folder
epassaro Jul 1, 2021
f65f45f
fix year in license
epassaro Jul 1, 2021
29ddcce
add comment about missing __githash__
epassaro Jul 1, 2021
88a5869
[build_docs]
epassaro Jul 1, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/documentation-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

- name: Build Sphinx Documentation
shell: bash -l {0}
run: python setup.py build_docs
run: cd docs/; make html

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Build documentation
shell: bash -l {0}
run: python setup.py build_docs
run: cd docs/; make html

- name: Extract branch name
shell: bash
Expand Down
62 changes: 25 additions & 37 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,64 +1,48 @@
# Compiled files
*.py[co]
*.py[cod]
*.a
*.o
*.so
__pycache__

# Logging
*.log


# Ignore .c files by default to avoid including generated code. If you want to
# add a non-generated .c extension, use `git add -f filename.c`.
*.c
!tardis/montecarlo/src/*.c


# Other generated files
*/version.py
*/cython_version.py
htmlcov
.coverage
.ipynb_checkpoints/
.pytest_cache/


# IDE Specific files
### Pycharm IDE - Jetbrains
.idea/*

# VSCode
.vscode/
*.code-workspace
MANIFEST
.ipynb_checkpoints

### PyDev IDE - Eclipse
.metadata
tmp/
*.tmp
*.bak
local.properties
.settings/
.loadpath
*.project
*.pydevproject
# Sphinx
docs/api
docs/_build

### YouCompleteMe - VIM plugin
.ycm_extra_conf.py
# Eclipse editor project files
.project
.pydevproject
.settings

# Pycharm editor project files
.idea

# Sphinx
_build
docs/api
# Floobits project files
.floo
.flooignore

# Visual Studio Code project files
.vscode

# Packages/installer info
*.egg
*.egg-info
.eggs/
dist
build
eggs
.eggs
parts
bin
var
Expand All @@ -67,11 +51,15 @@ develop-eggs
.installed.cfg
distribute-*.tar.gz


# Other
.*.swp
.cache
.tox
.*.sw[op]
*~

.project
.pydevproject
.settings
pip-wheel-metadata/

# Mac OSX
.DS_Store
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

16 changes: 3 additions & 13 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
include README.rst
include CHANGES.rst

include ez_setup.py
include ah_bootstrap.py
include setup.cfg
include LICENSE.rst
include pyproject.toml

recursive-include *.pyx *.c *.pxd *.h
recursive-include tardis/montecarlo/src *.h *.c
recursive-include tardis/io/schemas *.yml
recursive-include tardis/data *
recursive-include tardis *.pyx *.c *.pxd
recursive-include docs *
recursive-include licenses *
recursive-include cextern *
recursive-include scripts *

prune build
prune docs/_build
prune docs/api

recursive-include astropy_helpers *
recursive-include astropy_helpers/astropy_helpers.egg-info *
exclude astropy_helpers/.git
exclude astropy_helpers/.gitignore

global-exclude *.pyc *.o
14 changes: 11 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ stars (*supernovae*).
:target: https://dev.azure.com/tardis-sn/TARDIS/_build/latest?definitionId=3&repoName=tardis-sn%2Ftardis&branchName=refs%2Fpull%2F1573%2Fmerge





******************************
Credits & Publication Policies
******************************
Expand Down Expand Up @@ -180,3 +177,14 @@ The following BibTeX entries are needed for the references:
doi = {10.5281/zenodo.3893940},
url = {https://doi.org/10.5281/zenodo.3893940}
}


*******
License
*******

This project is Copyright (c) TARDIS Collaboration and licensed under
the terms of the BSD 3-Clause license. This package is based upon
the `Astropy package template <https://github.com/astropy/package-template>`_
which is licensed under the BSD 3-clause license. See the licenses folder for
more information.
Loading