Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EXP: Undo hacks in tox and see what happens #296

Closed
wants to merge 2 commits into from
Closed

EXP: Undo hacks in tox and see what happens #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d13377
EXP: Undo hacks in tox and see [skip codeql]
pllim Jan 6, 2021
62cc033
Use abs import in binning tests [skip codeql]
pllim Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci_workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
push:
pull_request_target:
pull_request:
pllim marked this conversation as resolved.
Show resolved Hide resolved
schedule:
# Weekly Monday 6AM build
# * is a special character in YAML so you have to quote this string
Expand Down
6 changes: 3 additions & 3 deletions synphot/tests/test_binning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
from astropy.utils.data import get_pkg_data_filename

# LOCAL
from .. import binning, exceptions, specio
from ..utils import merge_wavelengths, generate_wavelengths
from synphot import binning, exceptions, specio
from synphot.utils import merge_wavelengths, generate_wavelengths


@pytest.mark.parametrize(
Expand Down Expand Up @@ -232,7 +232,7 @@ def setup_class(self):

def test_c_ext(self):
# C-EXT: Sum over each bin.
from .. import synphot_utils
from synphot import synphot_utils

binflux_c, intwave_c = synphot_utils.calcbinflux(
self.size, self.i_beg, self.i_end, self.avflux, self.deltaw)
Expand Down
7 changes: 1 addition & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ isolated_build = true
# Pass through the following environemnt variables which are needed for the CI
passenv = HOME WINDIR CC CI

# FIXME: Cannot do this, need to force C-ext to build below.
# Run the tests in a temporary directory to make sure that we don't import
# package from the source tree
#changedir = .tmp/{envname}
changedir = .tmp/{envname}

# tox environments are constructued with so-called 'factors' (or terms)
# separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor:
Expand Down Expand Up @@ -53,10 +52,6 @@ extras =
alldeps: all

commands =
# FIXME: Not sure why need this for tox to see the C-ext
python -m pip install extension-helpers
python setup.py build_ext --inplace
# End of FIXME
pip freeze
!cov: pytest --pyargs synphot {toxinidir}/docs {posargs}
cov: pytest --pyargs synphot {toxinidir}/docs --cov synphot --cov-config={toxinidir}/setup.cfg {posargs}
Expand Down