Skip to content

Commit 6ea915f

Browse files
eteqkeflavich
authored andcommitted
ALL Package-Template comits
updated docs Makefile to reflect astropy Move the py.test conftest.py file to the astropy directory so it is installed. Changed the import of plugins accordingly. Also updated the .gitignore file so it ignores the Mac OS X .DS_Store file. fixed conf.py to not insert source dir into sys.path typo fixes in conf.py comment Added CSS file from Astropy core package Updated setup.cfg to match Astropy core package Copy bootstrap-astropy theme from astropy remove default.css import from astropy.css - now not needed update conf.py to use bootstrap-astropy theme, mirror astropy's version use installed astropy theme Added templates that inherit from core package Added `_templates` to list of patterns to exclude added comment directing to base of jinja template Update testing to only import pytest when tests are run Added `coverage` option that was added in the Astropy core Removed comments added kwarg options to test runner removed line setting unused _test_runner variable Updated setup.py to bring it in line with the Astropy core Update distribute_setup.py to 0.6.28 Remove unnecessary instructions from README.rst tweak to instructions from @astrofrog's suggestion Changed check in setup.py to syntax in core package to avoid issues when Sphinx is not installed. Update setup.py to reflect re-factored setup code for 0.2 release If necessary, move configuration file to the right place on first import Added open_files option for test() and implemented fix for caught exception in __init__.py Fix scripts/README.rst bug added commented-out edit_on_github section to conf.py and related instructions in README line wrap fixes Add .travis.yml file Add instructions for travis-ci to README _PACKAGE_SETUP_ should be _ASTROPY_SETUP_ (see astropy/astropy#950) Test with different Numpy versions, only test Sphinx with Python 2.7. Ensure that optional dependencies for Sphinx are installed Updated distribute_setup.py to fix compatibility with setuptools 0.7 README typo fixes Switch to using ez_setup.py, and simplify setup.py, following recent changes in Astropy core. Updates to __init__.py to match Astropy core Minor fix Added backward compatibility with Astropy 0.2 parallel option can only be used with Astropy 0.3 or later Re-organize the setup.py so that Astropy is not required for egg_info Revert "Re-organize the setup.py so that Astropy is not required for egg_info" This reverts commit 9aa5339. Replace distribute_setup.py with ez_setup.py and ``setuptools_bootstrap.py`` Support `setup.py test --coverage` in affiliated packages. Simplify package-template usage and updating by requiring fewer files to be edited. Add information about pulling changes to package template Store stuff in "metadata" section, not "affiliated" section. Insert space before comment. Fix documentation build Elaborate on the need to search for .c files in a comment. Change ``clean`` rule to remove generated docs Made necessary by astropy/astropy@b94fd38 Update to newer ez_setup.py Add the current version of ah_bootstrap--for the tests themselves we will always copy over the latest version of ah_bootstrap (so that we can test ah_bootstrap itself), but there should still be a default copy of it in the package-template repo as well Configure the package-template to use astropy_helpers. By default includes astropy_helpers as a submodule. Yes, astropy_helpers is now a submodule of package_template which is a submodule of astropy_helpers update the astropy_helpers version to include fix from c3f841b9e099f506a751b8a6971b15e7e3d6590a Update the astropy_helpers version used in the package_template Update the astropy_helpers version again; use the auto_use feature of ah_bootstrap. Switch to using astropy_helpers for docs build. Updated astropy_helpers version (included fix for Python 3) Update the git submodule path to use http instead--hopefully this will work then on Travis Updating to the actual astropy-helpers Updated astropy-helpers to latest version Fixing docs links in package test function Added example API docs Updated astropy-helpers to latest version. This version includes fixes for the coverage testing in affiliated packages. Use wheels for travis testing Care is taken to use a numpy wheel whose version matches the scipy/astropy wheels. Previous commit messages: Use development astropy for test --coverage Install coverage when needed Add cython to the travis build environment, controlled by an environmental variable Also added a few more words of advice to the travis part of the README Restore -w option to build_sphinx Change URL for numpy-specific wheels and make scipy an optional install Fix latest stable numpy version Several tweaks to improve performance and reduce unnecessary tests Remove debugging statements and cython install in egg_only Don't override package data after it's been determined from setup_package.py files Include astropy_helpers in the affilated package's tarball. Fix pyspeckit#69: Affiliated packages can opt-in to deprecations-as-exceptions removed setuptools_bootstrap.py as it doesn't exist any more in the new package-template added ah_bootstrap and setup.cfg Update astropy_helpers Use MiniConda for affiliated packages Make sure conda’s astropy is removed before pip installing the latest developer version Added more comments to .travis.yml Pin Numpy version Don’t use --parallel with Python 3 More tidying up of .travis.yml file Move astropy dev builds earlier in .travis.yml Since they take longer, it is better to start them sooner for improved load balancing. Import astropy_helpers from inside the docs/ directory Fix a warning that "Could not determine version of package ccdproc" from configuration system (since the __version__ member doesn't yet exist for the package when the configuration file is copied). More detail in example __init__.py Add numpy import to exmaple_mod This ensures that egg_info builds will break if __init__.py is not set up properly Add coveralls --rcfile option Update README for coveralls rcfile Use the version module correctly in edit_on_github Closes pyspeckit#55. Added files to ignore in affiliated package coverage tests Clarify purpose of cextern directory. Updated astropy-helpers to v0.4 Update ah_bootstrap.py from astropy-helpers Replace development build with stable now that astropy 0.4 is out Closes pyspeckit#65 Add info about a specific Sphinx version check. explain readthedocs add released versions of astropy-helper and astropy to rtd-requirements Add a few entries to .gitignore
1 parent 58106d9 commit 6ea915f

27 files changed

Lines changed: 1778 additions & 748 deletions

‎.gitignore‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,18 @@ __pycache__
1111

1212
# Other generated files
1313
*/version.py
14+
*/cython_version.py
15+
htmlcov
16+
.coverage
1417

1518
# Sphinx
16-
_build
19+
docs/api
20+
docs/_build
21+
22+
# Eclipse editor project files
23+
.project
24+
.pydevproject
25+
.settings
1726

1827
# Packages/installer info
1928
*.egg
@@ -32,3 +41,6 @@ distribute-*.tar.gz
3241
# Other
3342
.*.swp
3443
*~
44+
45+
# Mac OSX
46+
.DS_Store

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "astropy_helpers"]
2+
path = astropy_helpers
3+
url = https://github.com/astropy/astropy-helpers.git

‎.travis.yml‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
language: python
2+
3+
python:
4+
- 2.6
5+
- 2.7
6+
- 3.2
7+
- 3.3
8+
- 3.4
9+
# This is just for "egg_info". All other builds are explicitly given in the matrix
10+
env:
11+
global:
12+
# The following versions are the 'default' for tests, unless
13+
# overidden underneath. They are defined here in order to save having
14+
# to repeat them for all configurations.
15+
- NUMPY_VERSION=1.8
16+
- ASTROPY_VERSION=stable
17+
- CONDA_INSTALL='conda install -c astropy-ci-extras --yes'
18+
- PIP_INSTALL='pip install'
19+
matrix:
20+
- SETUP_CMD='egg_info'
21+
22+
matrix:
23+
include:
24+
25+
# Do a coverage test in Python 2.
26+
- python: 2.7
27+
env: SETUP_CMD='test --coverage'
28+
29+
# Check for sphinx doc build warnings - we do this first because it
30+
# may run for a long time
31+
- python: 2.7
32+
env: SETUP_CMD='build_sphinx -w'
33+
34+
# Try Astropy development version
35+
- python: 2.7
36+
env: ASTROPY_VERSION=development SETUP_CMD='test'
37+
- python: 3.3
38+
env: ASTROPY_VERSION=development SETUP_CMD='test'
39+
40+
# Try all python versions with the latest numpy
41+
- python: 2.6
42+
env: SETUP_CMD='test'
43+
- python: 2.7
44+
env: SETUP_CMD='test'
45+
- python: 3.2
46+
env: SETUP_CMD='test'
47+
- python: 3.3
48+
env: SETUP_CMD='test'
49+
- python: 3.4
50+
env: SETUP_CMD='test'
51+
52+
# Try older numpy versions
53+
- python: 3.2
54+
env: NUMPY_VERSION=1.6 SETUP_CMD='test'
55+
- python: 2.7
56+
env: NUMPY_VERSION=1.7 SETUP_CMD='test'
57+
- python: 2.7
58+
env: NUMPY_VERSION=1.6 SETUP_CMD='test'
59+
- python: 2.7
60+
env: NUMPY_VERSION=1.5 SETUP_CMD='test'
61+
62+
before_install:
63+
64+
# Use utf8 encoding. Should be default, but this is insurance against
65+
# future changes
66+
- export PYTHONIOENCODING=UTF8
67+
- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
68+
- chmod +x miniconda.sh
69+
- ./miniconda.sh -b
70+
- export PATH=/home/travis/miniconda/bin:$PATH
71+
- conda update --yes conda
72+
73+
# DOCUMENTATION DEPENDENCIES
74+
- if [[ $SETUP_CMD == build_sphinx* ]]; then sudo apt-get install graphviz texlive-latex-extra dvipng; fi
75+
76+
install:
77+
78+
# CONDA
79+
- conda create --yes -n test -c astropy-ci-extras python=$TRAVIS_PYTHON_VERSION
80+
- source activate test
81+
82+
# CORE DEPENDENCIES
83+
- if [[ $SETUP_CMD != egg_info ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION pytest pip Cython; fi
84+
- if [[ $SETUP_CMD != egg_info ]]; then $PIP_INSTALL pytest-xdist; fi
85+
86+
# ASTROPY
87+
- if [[ $SETUP_CMD != egg_info ]] && [[ $ASTROPY_VERSION == development ]]; then $PIP_INSTALL git+http://github.com/astropy/astropy.git#egg=astropy; fi
88+
- if [[ $SETUP_CMD != egg_info ]] && [[ $ASTROPY_VERSION == stable ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION astropy; fi
89+
90+
# OPTIONAL DEPENDENCIES
91+
# Here you can add any dependencies your package may have. You can use
92+
# conda for packages available through conda, or pip for any other
93+
# packages. You should leave the `numpy=$NUMPY_VERSION` in the `conda`
94+
# install since this ensures Numpy does not get automatically upgraded.
95+
# - if [[ $SETUP_CMD != egg_info ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION ... ; fi
96+
# - if [[ $SETUP_CMD != egg_info ]]; then $PIP_INSTALL ...; fi
97+
98+
# DOCUMENTATION DEPENDENCIES
99+
# build_sphinx needs sphinx and matplotlib (for plot_directive). Note that
100+
# this matplotlib will *not* work with py 3.x, but our sphinx build is
101+
# currently 2.7, so that's fine
102+
- if [[ $SETUP_CMD == build_sphinx* ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION Sphinx matplotlib; fi
103+
104+
# COVERAGE DEPENDENCIES
105+
- if [[ $SETUP_CMD == 'test --coverage' ]]; then $PIP_INSTALL coverage coveralls; fi
106+
107+
script:
108+
- python setup.py $SETUP_CMD
109+
110+
after_success:
111+
# If coveralls.io is set up for this package, uncomment the line
112+
# below and replace "packagename" with the name of your package.
113+
# The coveragerc file may be customized as needed for your package.
114+
# - if [[ $SETUP_CMD == 'test --coverage' ]]; then coveralls --rcfile='packagename/tests/coveragerc'; fi

‎MANIFEST.in‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
include README.rst
22

3-
include distribute_setup.py
4-
recursive-include packagename *.pyx *.c
3+
include ez_setup.py
4+
include ah_bootstrap.py
5+
include setup.cfg
56

67
recursive-include docs *
78
recursive-include licenses *
89
recursive-include cextern *
910
recursive-include scripts *
1011

11-
exclude *.pyc *.o
12+
exclude *.pyc *.o
1213
prune docs/_build
1314
prune build
1415

16+
recursive-include astropy_helpers *
17+
exclude astropy_helpers/.git
18+
exclude astropy_helpers/.gitignore

0 commit comments

Comments
 (0)