Skip to content

Commit 0f39614

Browse files
authored
Remove astropy test runner and other updates (#185)
* Stop using _astropy_init.py * Delete astrowidgets/_astropy_init.py * Delete astrowidgets/conftest.py because we do not use astropy test runner, so root level copy is enough * Update setup.cfg * Update tox.ini * TST: Bump Python versions * Update ci_workflows.yml
1 parent 81c38c4 commit 0f39614

File tree

6 files changed

+11
-59
lines changed

6 files changed

+11
-59
lines changed

.github/workflows/ci_workflows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242
- name: Set up Python
4343
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
4444
with:
45-
python-version: '3.10'
45+
python-version: '3.11'
4646
- name: Install and build
4747
run: python -m pip install tox --upgrade
4848
- name: Run tests
49-
run: tox -e py310-test
49+
run: tox -e py311-test
5050

5151
devtests:
5252
runs-on: ubuntu-latest
@@ -56,8 +56,8 @@ jobs:
5656
- name: Set up Python
5757
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
5858
with:
59-
python-version: '3.11'
59+
python-version: '3.13'
6060
- name: Install and build
6161
run: python -m pip install tox --upgrade
6262
- name: Run tests
63-
run: tox -e py311-test-devdeps
63+
run: tox -e py313-test-devdeps

astrowidgets/__init__.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# Licensed under a 3-clause BSD style license - see LICENSE.rst
2-
3-
# Packages may add whatever they like to this file, but
4-
# should keep this content at the top.
5-
# ----------------------------------------------------------------------------
6-
from ._astropy_init import * # noqa
7-
# ----------------------------------------------------------------------------
2+
try:
3+
from .version import version as __version__
4+
except ImportError:
5+
__version__ = ''
86

97
from .ginga import * # noqa

astrowidgets/_astropy_init.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

astrowidgets/conftest.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

setup.cfg

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ docs =
5656
[coverage:run]
5757
source = astrowidgets
5858
omit =
59-
astrowidgets/_astropy_init*
60-
astrowidgets/conftest*
6159
astrowidgets/cython_version*
6260
astrowidgets/setup_package*
6361
astrowidgets/*/setup_package*
@@ -66,8 +64,6 @@ omit =
6664
astrowidgets/*/tests/*
6765
astrowidgets/*/*/tests/*
6866
astrowidgets/version*
69-
*/astrowidgets/_astropy_init*
70-
*/astrowidgets/conftest*
7167
*/astrowidgets/cython_version*
7268
*/astrowidgets/setup_package*
7369
*/astrowidgets/*/setup_package*

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{38,39,310,311}-test{,-devdeps,-predeps}
3+
py{310,311,312,313}-test{,-devdeps,-predeps}
44
requires =
55
setuptools >= 30.3.0
66
pip >= 19.3.1
@@ -9,14 +9,15 @@ requires =
99
setenv =
1010
MPLBACKEND=agg
1111
JUPYTER_PLATFORM_DIRS=1
12+
devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple
1213

1314
extras = test
1415

1516
changedir =
1617
test: .tmp/{envname}
1718

1819
deps =
19-
devdeps: git+https://github.com/astropy/astropy.git#egg=astropy
20+
devdeps: astropy>=0.0.dev0
2021
devdeps: git+https://github.com/ejeschke/ginga.git#egg=ginga
2122

2223
commands =

0 commit comments

Comments
 (0)