Skip to content

Commit

Permalink
Merge pull request #661 from drdavella/test-legacy-and-prerelease
Browse files Browse the repository at this point in the history
Test against legacy and prerelease versions of dependencies
  • Loading branch information
drdavella authored Mar 15, 2019
2 parents c5a5c6f + 6798040 commit 3871f34
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 19 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,18 @@ matrix:
- env: TOXENV='py35-numpy11'
- env: TOXENV='py36-numpy12'

# test against oldest compatible versions of all dependencies
- env: TOXENV='py35-legacy'

# also test against development versions of Astropy and GWCS
- env: TOXENV='py37-astrodev'

# Test against development version of numpy (this job can fail)
- env: TOXENV='py37-numpydev'

# Test against prerelease versions of all dependencies
- env: TOXENV='prerelease'

# Try a run on OSX
- os: osx
env: TOXENV='py37-stable'
Expand All @@ -87,8 +93,8 @@ matrix:
# Py37 on Windows at the moment
- os: windows
env: TOXENV='py37-stable' TOX_ARGS='--remote-data'

- env: TOXENV='py37-numpydev'
- env: TOXENV='prerelease'

install:
- git clone git://github.com/astropy/ci-helpers.git
Expand Down
17 changes: 0 additions & 17 deletions asdf/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# by importing them here in conftest.py they are discoverable by py.test
# no matter how it is invoked within the source tree.

from astropy.tests.plugins.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS

import os

import pytest
Expand All @@ -17,21 +15,6 @@
from . import version
from .tests.httpserver import HTTPServer, RangeHTTPServer

packagename = os.path.basename(os.path.dirname(__file__))
TESTED_VERSIONS[packagename] = version.version


try:
PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
PYTEST_HEADER_MODULES['jsonschema'] = 'jsonschema'
PYTEST_HEADER_MODULES['pyyaml'] = 'yaml'
PYTEST_HEADER_MODULES['six'] = 'six'
del PYTEST_HEADER_MODULES['h5py']
del PYTEST_HEADER_MODULES['Matplotlib']
del PYTEST_HEADER_MODULES['Scipy']
except (NameError, KeyError):
pass


@pytest.fixture()
def httpserver(request):
Expand Down
2 changes: 1 addition & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
('asdf', 'asdf'),
('numpy', 'numpy'),
('jsonschema', 'jsonschema'),
('pyyaml', 'pyyaml'),
('pyyaml', 'yaml'),
('astropy', 'astropy')])

try:
Expand Down
9 changes: 9 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[tox]
envlist =
{py36,py37}-{stable,gwcsdev},py37-astrodev
py35-legacy

[testenv]
deps=
Expand All @@ -13,6 +14,10 @@ deps=
py35-!astrodev,py36-!astrodev: gwcs~=0.9.1
py37-!astrodev: gwcs
numpydev: git+git://github.com/numpy/numpy
legacy: semantic_version==2.3.1
legacy: pyyaml==3.10
legacy: jsonschema==2.3
legacy: numpy~=1.10.0
conda_deps=
pytest
!astrodev: astropy
Expand All @@ -26,6 +31,10 @@ commands=
astrodev: pip install --no-deps git+git://github.com/spacetelescope/gwcs
pytest {posargs}

[testenv:prerelease]
basepython= python3.7
pip_pre= true

[testenv:egg_info]
deps=
conda_deps=
Expand Down

0 comments on commit 3871f34

Please sign in to comment.