return opencv-python to a hard dependency

.github/workflows/ci.yml

@@ -82,9 +82,6 @@ jobs:
  - toxenv: test-oldestdeps-xdist-cov
  os: ubuntu-latest
  python-version: '3.8'
- - toxenv: test-opencv-xdist
- os: ubuntu-latest
- python-version: '3.10'
  steps:
  - uses: actions/checkout@v3
  with:

CHANGES.rst

@@ -31,6 +31,8 @@ other
 - Fix memory leaks in packages that use C code: ``cube_build``,
  ``wfss_contam``, and ``straylight``. [#7493]
 
+- add `opencv-python` to hard dependencies for usage of snowball detection in the jump step in `stcal` [#7499]
+
 outlier_detection
 -----------------
 

jwst/jump/tests/test_jump_step.py

@@ -7,13 +7,6 @@
 
 from jwst.jump import JumpStep
 
-try:
- import cv2 as cv # noqa: F401
-
- OPENCV_INSTALLED = True
-except ImportError:
- OPENCV_INSTALLED = False
-
 MAXIMUM_CORES = ['none', 'quarter', 'half', 'all']
 
 
@@ -311,7 +304,6 @@ def test_three_group_integration(generate_miri_reffiles, setup_inputs):
  assert out_model.meta.cal_step.jump == 'COMPLETE'
 
 
-@pytest.mark.xfail(not OPENCV_INSTALLED, reason="`opencv-python` not installed")
 def test_snowball_flagging_nosat(generate_nircam_reffiles, setup_inputs):
  """Test that snowballs are properly flagged when the `sat_required_snowball`,
  which requires there to be a saturated pixel within the cluster of
@@ -356,7 +348,6 @@ def test_snowball_flagging_nosat(generate_nircam_reffiles, setup_inputs):
  assert (np.floor(expanded_area / initial_area) == (expand_factor**2))
 
 
-@pytest.mark.xfail(not OPENCV_INSTALLED, reason="`opencv-python` not installed")
 def test_snowball_flagging_sat(generate_nircam_reffiles, setup_inputs):
  """Test that snowballs are properly flagged when the `sat_required_snowball`,
  which requires there to be a saturated pixel within the cluster of

requirements-sdp.txt

@@ -12,5 +12,5 @@
 #
 # conda create -n sdp python -y
 # conda activate sdp
-# pip install -e .[test,sdp] "opencv-python>=4.6.0.66"
+# pip install -e .[test,sdp]
 # pip freeze | grep -v jwst >> requirements-sdp.txt

setup.cfg

@@ -35,6 +35,7 @@ install_requires =
  drizzle>=1.13.7
  gwcs>=0.18.3
  numpy>=1.20
+ opencv-python>=4.6.0.66
  photutils>=1.4.0
  psutil>=5.7.2
  poppy>=1.0.2

tox.ini

@@ -41,7 +41,6 @@ commands =
 [testenv]
 description =
  run tests
- opencv: requiring opencv-python
  devdeps: with the latest developer version of key dependencies
  oldestdeps: with the oldest supported version of key dependencies
  sdpdeps: with the recent STScI DMS release pinned dependencies
@@ -68,7 +67,6 @@ deps =
  xdist: pytest-xdist
  devdeps: -rrequirements-dev.txt
  sdpdeps: -rrequirements-sdp.txt
- opencv: opencv-python
  oldestdeps: minimum_dependencies
 package =
  !pyargs: editable
@@ -87,7 +85,6 @@ commands =
  regtests: --bigdata --slow --basetemp={homedir}/test_outputs \
  xdist: -n auto \
  pyargs: {toxinidir}/docs --pyargs jwst \
- opencv: -- jwst/jump/tests/test_jump_step.py \
  {posargs}
 
 [testenv:build-docs]