Skip to content

Commit

Permalink
Merge pull request #691 from mwcraig/remove-appveyor
Browse files Browse the repository at this point in the history
Remove appveyor in favor of travis windows
  • Loading branch information
mwcraig committed Aug 1, 2019
2 parents 848539e + 653ba57 commit 93ae265
Show file tree
Hide file tree
Showing 9 changed files with 200 additions and 180 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: python
language: c

# Setting sudo to false opts in to Travis-CI container-based builds.
sudo: false
Expand All @@ -12,10 +12,6 @@ addons:
- texlive-latex-extra
- dvipng

python:
- 3.5
- 3.6

env:
global:
# The following versions are the 'default' for tests, unless
Expand All @@ -38,6 +34,12 @@ matrix:
- env: PYTHON_VERSION=3.7
SETUP_CMD='egg_info'

# Do a windows run
- os: windows
env: PYTHON_VERSION=3.7
ASTROPY_VERSION=stable
NUMPY_VERSION=stable

# Try Astropy/NumPy development versions. This requires them to be
# compiled during setup which takes some time.
- env: PYTHON_VERSION=3.7
Expand Down
38 changes: 0 additions & 38 deletions appveyor.yml

This file was deleted.

12 changes: 7 additions & 5 deletions ccdproc/tests/pytest_fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
DEFAULT_SEED = 123
DEFAULT_DATA_SIZE = 100
DEFAULT_DATA_SCALE = 1.0
DEFAULT_DATA_MEAN = 0.0


def value_from_markers(key, request):
Expand All @@ -35,8 +36,9 @@ def value_from_markers(key, request):
return DEFAULTS[key]


@pytest.fixture
def ccd_data(request):
def ccd_data(data_size=DEFAULT_DATA_SIZE,
data_scale=DEFAULT_DATA_SCALE,
data_mean=DEFAULT_DATA_MEAN):
"""
Return a CCDData object with units of ADU.
Expand All @@ -53,9 +55,9 @@ def ccd_data(request):
The mean can be changed with the marker @pytest.marker.scale(m) on the
test function, where m is the desired mean.
"""
size = value_from_markers('data_size', request)
scale = value_from_markers('data_scale', request)
mean = value_from_markers('data_mean', request)
size = data_size
scale = data_scale
mean = data_mean

with NumpyRNGContext(DEFAULTS['seed']):
data = np.random.normal(loc=mean, size=[size, size], scale=scale)
Expand Down

0 comments on commit 93ae265

Please sign in to comment.