Skip to content

Commit

Permalink
APE 17 migration (#196)
Browse files Browse the repository at this point in the history
  • Loading branch information
ntessore authored Jun 22, 2020
1 parent 2d4fe85 commit 573a0a0
Show file tree
Hide file tree
Showing 40 changed files with 672 additions and 2,289 deletions.
13 changes: 5 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2
jobs:
build-docs:
build_docs:
docker:
- image: circleci/python:3.5
- image: circleci/python:3.6
steps:
- checkout
- run:
Expand All @@ -13,14 +13,11 @@ jobs:
- run:
name: Install Dependencies
command: |
python3 -m venv venv
. venv/bin/activate
pip install scipy astropy sphinx-astropy networkx "setuptools>=30.3" wheel
pip install tox
- run:
name: Build Docs
command: |
. venv/bin/activate
python setup.py build_docs
tox -e build_docs
- run:
name: Prepare Upload
command: |
Expand All @@ -40,7 +37,7 @@ workflows:
version: 2
run_all_checks:
jobs:
- build-docs
- build_docs
notify:
webhooks:
- url: https://giles.cadair.dev/circleci
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ on:
branches:
- master
jobs:
flake8:
codestyle:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Install Python 3.5
uses: actions/setup-python@v1
- name: Install Python 3.6
uses: actions/setup-python@v2
with:
python-version: 3.5
python-version: 3.6
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 "setuptools>=30.3"
pip install tox
- name: Add flake8 Matcher
run: |
echo ::add-matcher::.github/problem_matchers/flake8.json
- name: Run flake8
- name: Check Code Style
run: |
python setup.py flake8
tox -e codestyle
15 changes: 8 additions & 7 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,29 @@ on:
branches:
- master
jobs:
build-docs:
build_docs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Install Python 3.5
uses: actions/setup-python@v1
- name: Install Python 3.6
uses: actions/setup-python@v2
with:
python-version: 3.5
python-version: 3.6
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install scipy astropy sphinx-astropy networkx "setuptools>=30.3"
pip install tox
sudo apt-get install graphviz
- name: Add sphinx Matcher
run: |
echo ::add-matcher::.github/problem_matchers/sphinx.json
- name: Build Docs
run: |
python setup.py build_docs
tox -e build_docs
- name: Clean Docs
run: |
rm -r docs/_build/html/{_sources,_modules,.doctrees}
rm -rf docs/_build/html/{_sources,_modules,.doctrees}
- name: Upload Docs
uses: actions/upload-artifact@v1
with:
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,19 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Install Python 3.5
uses: actions/setup-python@v1
- name: Install Python 3.6
uses: actions/setup-python@v2
with:
python-version: 3.5
python-version: 3.6
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install astropy networkx pytest pytest-astropy 'coverage<5' scipy "setuptools>=30.3" wheel
pip install tox
- name: Add pytest Matcher
run: |
echo ::add-matcher::.github/problem_matchers/pytest.json
- name: Run Tests
- name: Run Tests with Coverage
run: |
python setup.py test --coverage
- name: Generate Coverage
run: |
coverage xml -i
tox -e py36-test-numpy118-scipy14-astropy40-cov -- --cov-report xml
- name: Report Coverage
uses: codecov/codecov-action@v1
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

27 changes: 2 additions & 25 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,39 +1,16 @@
include README.rst
include CHANGES.rst

include ah_bootstrap.py
include setup.cfg
include skypy/tests/coveragerc
include LICENSE.rst
include pyproject.toml

recursive-include skypy *.pyx *.c *.pxd
recursive-include docs *
recursive-include licenses *
recursive-include cextern *
recursive-include scripts *

prune build
prune docs/_build
prune docs/api


# the next few stanzas are for astropy_helpers. It's derived from the
# astropy_helpers/MANIFEST.in, but requires additional includes for the actual
# package directory and egg-info.

include astropy_helpers/README.rst
include astropy_helpers/CHANGES.rst
include astropy_helpers/LICENSE.rst
recursive-include astropy_helpers/licenses *

include astropy_helpers/ah_bootstrap.py

recursive-include astropy_helpers/astropy_helpers *.py *.pyx *.c *.h *.rst
recursive-include astropy_helpers/astropy_helpers.egg-info *
# include the sphinx stuff with "*" because there are css/html/rst/etc.
recursive-include astropy_helpers/astropy_helpers/sphinx *

prune astropy_helpers/build
prune astropy_helpers/astropy_helpers/tests


global-exclude *.pyc *.o
Loading

0 comments on commit 573a0a0

Please sign in to comment.