Skip to content

Commit 212b087

Browse files
committed
Bye astropy-helpers 🔥
Move long description to a file
1 parent c4cfec7 commit 212b087

24 files changed

+152
-1450
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ sdist
5050
develop-eggs
5151
.installed.cfg
5252
distribute-*.tar.gz
53+
pip-wheel-metadata/
5354

5455
# IPython notebook (Jupyter) checkpoints
5556
.ipynb_checkpoints

.gitmodules

-3
This file was deleted.

.readthedocs.yml

-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ python:
1717
extra_requirements:
1818
- docs
1919
- recommended
20-
- method: setuptools
21-
path: .
22-
23-
submodules:
24-
include: all
2520

2621
# Build PDF & ePub
2722
formats:

.travis.yml

+16-39
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ os:
1111
# Setting sudo to false opts in to Travis-CI container-based builds.
1212
sudo: false
1313

14-
# The apt packages below are needed for sphinx builds. A full list of packages
15-
# that can be included can be found here:
16-
#
17-
# https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
18-
19-
addons:
20-
apt:
21-
packages:
22-
- graphviz
23-
- texlive-latex-extra
24-
- dvipng
25-
2614
env:
2715
global:
2816
# The following versions are the 'default' for tests, unless
@@ -31,22 +19,13 @@ env:
3119
- PYTHON_VERSION=3.7
3220
- NUMPY_VERSION=stable
3321
- ASTROPY_VERSION=stable
34-
- SETUP_CMD='test'
3522
- PIP_DEPENDENCIES=''
36-
- MAIN_CMD='python setup.py'
23+
- INSTALL_CMD='pip install -e .'
24+
- MAIN_CMD='pytest --pyargs ginga doc'
3725
# *** TODO: We should test the various GUI toolkits that ginga supports
38-
# on travis-ci ... probably one build for Python 2 / 3 and each toolkit
26+
# on travis-ci ...
3927
# https://ginga.readthedocs.io/en/latest/install.html#dependences
4028
- CONDA_DEPENDENCIES='pyqt'
41-
# Conda channels now need to be explicitly listed, ci-helpers won't
42-
# add astropy and astropy-ci-extras by default.
43-
- CONDA_CHANNELS='astropy-ci-extras astropy'
44-
45-
matrix:
46-
# Make sure that egg_info works without dependencies
47-
- SETUP_CMD='egg_info'
48-
# Try all python versions with the latest Numpy
49-
- SETUP_CMD='test'
5029

5130
matrix:
5231

@@ -55,13 +34,10 @@ matrix:
5534

5635
include:
5736

58-
# Do a coverage test in Python 3.
59-
# *** TODO: `python setup.py test --coverage` doesn't work yet for `ginga` ... skipping for now
60-
# - os: linux
61-
# env: SETUP_CMD='test --coverage'
37+
# Try with the latest Numpy
38+
- os: linux
6239

6340
# Try older Numpy versions
64-
# TODO: Change to ASTROPY_VERSION=lts when PY2 job starts to fail.
6541
- os: linux
6642
env: PYTHON_VERSION=3.6 NUMPY_VERSION=1.13
6743
- os: linux
@@ -73,11 +49,16 @@ matrix:
7349

7450
# Try on Windows
7551
- os: windows
76-
env: SETUP_CMD='test'
7752

78-
# Do a PEP8 test with flake8 (white-list in setup.cfg)
53+
# Do a PEP 8 test with flake8 (white-list in setup.cfg)
54+
- os: linux
55+
env: MAIN_CMD='flake8 ginga --count' INSTALL_CMD=''
56+
57+
# Do a PEP 517 test with twine check
7958
- os: linux
80-
env: MAIN_CMD='flake8 ginga --count' SETUP_CMD=''
59+
env: CONDA_DEPENDENCIES='' PIP_DEPENDENCIES='pep517 twine'
60+
INSTALL_CMD='python -m pep517.build --source .'
61+
MAIN_CMD='twine check dist/*'
8162

8263
before_install:
8364

@@ -91,7 +72,7 @@ install:
9172
# We now use the ci-helpers package to set up our testing environment.
9273
# This is done by using Miniconda and then using conda and pip to install
9374
# dependencies. Which dependencies are installed using conda and pip is
94-
# determined by the CONDA_DEPDENDENCIES and PIP_DEPENDENCIES variables,
75+
# determined by the CONDA_DEPENDENCIES and PIP_DEPENDENCIES variables,
9576
# which should be space-delimited lists of package names. See the README
9677
# in https://github.com/astropy/ci-helpers for information about the full
9778
# list of environment variables that can be used to customize your
@@ -112,10 +93,6 @@ install:
11293
# other dependencies.
11394

11495
script:
115-
- $MAIN_CMD $SETUP_CMD
96+
- $INSTALL_CMD
97+
- $MAIN_CMD
11698

117-
after_success:
118-
# If coveralls.io is set up for this package, uncomment the line
119-
# below and replace "packagename" with the name of your package.
120-
# The coveragerc file may be customized as needed for your package.
121-
# - if [[ $SETUP_CMD == 'test --coverage' ]]; then coveralls --rcfile='ginga/tests/coveragerc'; fi

LONG_DESC.txt

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Ginga is a toolkit designed for building viewers for scientific image
2+
data in Python, visualizing 2D pixel data in numpy arrays.
3+
The Ginga toolkit centers around an image display class which supports
4+
zooming and panning, color and intensity mapping, a choice of several
5+
automatic cut levels algorithms and canvases for plotting scalable
6+
geometric forms. In addition to this widget, a general purpose
7+
'reference' FITS viewer is provided, based on a plugin framework.
8+
9+
Ginga is distributed under an open-source BSD licence. Please see the
10+
file LICENSE.txt in the top-level directory for details.

MANIFEST.in

+2-20
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
include README.md
2+
include LONG_DESC.txt
23
include CHANGES.rst
34
include LICENSE.*
45
include ROADMAP.rst
56
include CITATION
67
include ginga.desktop
78

8-
include ah_bootstrap.py
99
include setup.cfg
10+
include pyproject.toml
1011

1112
recursive-include *.pyx *.c *.pxd
1213
recursive-include doc *
@@ -19,23 +20,4 @@ prune build
1920
prune doc/_build
2021
prune doc/api
2122

22-
# the next few stanzas are for astropy_helpers. It's derived from the
23-
# astropy_helpers/MANIFEST.in, but requires additional includes for the actual
24-
# package directory and egg-info.
25-
26-
include astropy_helpers/README.rst
27-
include astropy_helpers/CHANGES.rst
28-
include astropy_helpers/LICENSE.rst
29-
recursive-include astropy_helpers/licenses *
30-
31-
include astropy_helpers/ah_bootstrap.py
32-
33-
recursive-include astropy_helpers/astropy_helpers *.py *.pyx *.c *.h
34-
recursive-include astropy_helpers/astropy_helpers.egg-info *
35-
# include the sphinx stuff with "*" because there are css/html/rst/etc.
36-
recursive-include astropy_helpers/astropy_helpers/sphinx *
37-
38-
prune astropy_helpers/build
39-
prune astropy_helpers/astropy_helpers/tests
40-
4123
global-exclude *.pyc *.o

0 commit comments

Comments
 (0)