Skip to content

Commit

Permalink
APE 17 migration (#1674)
Browse files Browse the repository at this point in the history
* remove ah submodule

* re-render setup.cfg

* remove get_package_data functions

* remove ah submodule (2)

* remove ez_setup.py

* re-render setup.py

* update pyproject.toml

* re-render .gitignore

* re-render MANIFEST.in

* add tox.ini

* re-render _astropy_init.py

* update __init__.py

* update conftest.py

* add licenses folder

* add license section to readme

* re-render docs cfg

* comment out __githash__ imports

* remove plasma setup_package.py

* disable doctests

* re apply black format

* fix author name

* add required dependency

* first round of changes to conf.py

* add jaladh changes to conf.py

* changes to doc workflows [build_docs]

* add atharva patch

* fix layout

* include package data [build_docs]

* add missing nbsphinx config

* more changes to conf.py [build_docs]

* minor changes

* add entry points

* black format script

* minor changes

* add support for CalVer :)

* comment out calver cfg

* fix typo

* minor changes

* consistent use of quotes in conf.py

* fix copyright [build_docs]

* remove obsolete .nojekyll from docs folder

* fix year in license

* add comment about missing __githash__

* [build_docs]
  • Loading branch information
epassaro authored Jul 1, 2021
1 parent 9ee2c9c commit 01a3495
Show file tree
Hide file tree
Showing 35 changed files with 670 additions and 2,115 deletions.
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

0 comments on commit 01a3495

Please sign in to comment.