Skip to content

Commit

Permalink
Merge pull request #213 from nden/update-standard
Browse files Browse the repository at this point in the history
update schemas
  • Loading branch information
nden authored Sep 20, 2016
2 parents cc74fe3 + 9a049bd commit 50546cf
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ env:
- NUMPY_VERSION=1.9
- ASTROPY_VERSION=development
- CONDA_DEPENDENCIES='jsonschema pyyaml six'
- PIP_DEPENDENCIES_FLAGS='--no-deps --force'
- PIP_DEPENDENCIES='git+http://github.com/spacetelescope/gwcs.git#egg=gwcs'
- SETUP_CMD='test --remote-data'

Expand All @@ -45,7 +46,7 @@ matrix:
- python: 2.7
env: NUMPY_VERSION=1.8 SETUP_CMD='test'
- python: 2.7
env: NUMPY_VERSION=1.7 SETUP_CMD='test'
env: NUMPY_VERSION=1.10 SETUP_CMD='test'

install:
- git clone git://github.com/astropy/ci-helpers.git
Expand Down
2 changes: 1 addition & 1 deletion asdf-standard
20 changes: 10 additions & 10 deletions asdf/tags/wcs/tests/test_wcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ def test_frames(tmpdir):
roll=3*u.deg)
),

cf.CelestialFrame(
reference_frame=coord.GCRS(
obstime=time.Time('2010-01-01'),
obsgeoloc=[1, 3, 2000] * u.pc,
obsgeovel=[2, 1, 8] * (u.m/u.s))),
#cf.CelestialFrame(
# reference_frame=coord.GCRS(
# obstime=time.Time('2010-01-01'),
# obsgeoloc=[1, 3, 2000] * u.pc,
# obsgeovel=[2, 1, 8] * (u.m/u.s))),

cf.CelestialFrame(
reference_frame=coord.CIRS(
Expand All @@ -119,11 +119,11 @@ def test_frames(tmpdir):
reference_frame=coord.ITRS(
obstime=time.Time('2022-01-03'))),

cf.CelestialFrame(
reference_frame=coord.PrecessedGeocentric(
obstime=time.Time('2010-01-01'),
obsgeoloc=[1, 3, 2000] * u.pc,
obsgeovel=[2, 1, 8] * (u.m/u.s)))
#cf.CelestialFrame(
# reference_frame=coord.PrecessedGeocentric(
# obstime=time.Time('2010-01-01'),
# obsgeoloc=[1, 3, 2000] * u.pc,
# obsgeovel=[2, 1, 8] * (u.m/u.s)))
]

tree = {
Expand Down
2 changes: 1 addition & 1 deletion astropy_helpers
Submodule astropy_helpers updated 53 files
+31 −19 .travis.yml
+140 −13 CHANGES.rst
+1 −0 MANIFEST.in
+2 −2 README.rst
+1 −1 ah_bootstrap.py
+16 −19 appveyor.yml
+17 −0 astropy_helpers/__init__.py
+81 −0 astropy_helpers/commands/_dummy.py
+307 −0 astropy_helpers/commands/_test_compat.py
+393 −107 astropy_helpers/commands/build_ext.py
+41 −27 astropy_helpers/commands/build_sphinx.py
+1 −0 astropy_helpers/commands/setup_package.py
+35 −0 astropy_helpers/commands/test.py
+1 −2 astropy_helpers/compat/subprocess.py
+1 −1 astropy_helpers/git_helpers.py
+41 −183 astropy_helpers/setup_helpers.py
+49 −14 astropy_helpers/sphinx/conf.py
+11 −1 astropy_helpers/sphinx/ext/astropyautosummary.py
+66 −0 astropy_helpers/sphinx/ext/autodoc_enhancements.py
+31 −8 astropy_helpers/sphinx/ext/automodapi.py
+60 −31 astropy_helpers/sphinx/ext/automodsumm.py
+2 −2 astropy_helpers/sphinx/ext/edit_on_github.py
+7 −6 astropy_helpers/sphinx/ext/smart_resolver.py
+7 −7 astropy_helpers/sphinx/ext/tests/__init__.py
+5 −5 astropy_helpers/sphinx/ext/tests/test_automodapi.py
+2 −2 astropy_helpers/sphinx/ext/tests/test_automodsumm.py
+37 −8 astropy_helpers/sphinx/ext/tests/test_docscrape.py
+1 −1 astropy_helpers/sphinx/ext/tests/test_utils.py
+113 −0 astropy_helpers/sphinx/ext/utils.py
+0 −220 astropy_helpers/sphinx/ext/viewcode.py
+ astropy_helpers/sphinx/local/python2_local_links.inv
+18 −0 astropy_helpers/sphinx/local/python2_local_links.txt
+ astropy_helpers/sphinx/local/python3_local_links.inv
+16 −0 astropy_helpers/sphinx/local/python3_local_links.txt
+ astropy_helpers/sphinx/local/python3links.inv
+0 −20 astropy_helpers/sphinx/local/python3links.txt
+1 −0 astropy_helpers/sphinx/setup_package.py
+1 −1 astropy_helpers/sphinx/themes/bootstrap-astropy/layout.html
+16 −4 astropy_helpers/sphinx/themes/bootstrap-astropy/static/bootstrap-astropy.css
+7 −244 astropy_helpers/test_helpers.py
+8 −5 astropy_helpers/tests/coveragerc
+27 −27 astropy_helpers/tests/test_git_helpers.py
+255 −58 astropy_helpers/tests/test_setup_helpers.py
+24 −0 astropy_helpers/tests/test_utils.py
+220 −3 astropy_helpers/utils.py
+1 −2 astropy_helpers/version_helpers.py
+0 −71 continuous-integration/appveyor/install-miniconda.ps1
+0 −47 continuous-integration/appveyor/windows_sdk.cmd
+0 −7 continuous-integration/travis/install_conda_linux.sh
+0 −7 continuous-integration/travis/install_conda_osx.sh
+0 −4 continuous-integration/travis/install_graphviz_linux.sh
+0 −4 continuous-integration/travis/install_graphviz_osx.sh
+1 −1 setup.py

0 comments on commit 50546cf

Please sign in to comment.