Skip to content

Commit

Permalink
Adds dependancies and correct ci
Browse files Browse the repository at this point in the history
  • Loading branch information
CyclingNinja committed Apr 17, 2024
1 parent 2d08fef commit 4e22a9b
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 17 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ jobs:
envs: |
- linux: py312
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }
}

sdist_verify:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -96,13 +97,11 @@ jobs:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

publish_pure:
needs: [test, docs]
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main
if: |
github.event_name != 'pull_request' && (
github.ref_name != 'main' ||
github.event_name == 'workflow_dispatch' )
needs: [test]
needs: [test, docs]
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
with:
python-version: '3.10'
Expand All @@ -113,7 +112,7 @@ jobs:
pypi_token: ${{ secrets.pypi_token }}
notify:
if: always() && github.event_name == 'workflow_dispatch'
needs: [publish, cron]
needs: [publish_pure, cron]
runs-on: ubuntu-latest
steps:
- uses: Cadair/matrix-notify-action@main
Expand Down
22 changes: 19 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,35 @@ license = { file = "licenses/LICENSE.rst", content-type = "text/plain" }
authors = [
{ name = "The SunPy Community", email = "[email protected]" },
]
dependencies = []
dependencies = [
"astropy>=5.0.6,!=5.1.0",
"gwcs>=0.18",
"numpy>=1.23.0",
"dask"
]
dynamic = ["version"]

[project.optional-dependencies]
tests = [
"dask",
"pytest",
"pytest-astropy",
"pytest-doctestplus",
"pytest-cov"
"pytest-mpl>=0.12",
"scipy",
"sunpy>=5.0.0"
]
docs = [
"matplotlib",
"mpl-animators>=1.0",
"pytest-docstestplus>=0.9.0",
"sphinx",
"sphinx-automodapi",
"tomli; python_version <\"3.11\"",
"sphinx-changelog>=1.1.0",
"sphinx-gallery",
"sphinxext-opengraph",
"sunpy-sphinx-theme",
"sunpy>=5.0.0"
]

[project.urls]
Expand Down
12 changes: 3 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,7 @@ deps =
online: pytest-rerunfailures
online: pytest-timeout
# Oldest Dependencies
oldestdeps: sunpy<4.0
oldestdeps: astropy<4.3
oldestdeps: gwcs<0.16
oldestdeps: numpy<1.23
oldestdeps: matplotlib<3.3
oldestdeps: mpl_animators<1.1
oldestdeps: reproject==0.7.1
oldestdeps: scipy<1.8.0
oldestdeps: dask<2021.5.0
oldestdeps: minimum_dependencies
# Figure tests need a tightly controlled environment
figure-!devdeps: matplotlib==3.7.2
figure-!devdeps: astropy==5.3.3
Expand All @@ -79,6 +71,8 @@ extras =
commands =
!oldestdeps-!online-!hypothesis-!figure: {env:PYTEST_COMMAND} {posargs}
online: {env:PYTEST_COMMAND} --reruns 2 --reruns-delay 15 --timeout=180 --remote-data=any {posargs}
oldestdeps: minimum_dependencies {{ cookiecutter.module_name }} --filename requirements-min.txt
oldestdeps: pip install -r requirements-min.txt
figure: /bin/bash -c "mkdir -p ./figure_test_images; python -c 'import matplotlib as mpl; print(mpl.ft2font.__file__, mpl.ft2font.__freetype_version__, mpl.ft2font.__freetype_build_type__)' > ./figure_test_images/figure_version_info.txt"
figure: /bin/bash -c "pip freeze >> ./figure_test_images/figure_version_info.txt"
figure: /bin/bash -c "cat ./figure_test_images/figure_version_info.txt"
Expand Down

0 comments on commit 4e22a9b

Please sign in to comment.