Merge pull request #3700 from spacetelescope/0.13.5x

0.13.5x
spacetelescope · Jun 19, 2019 · f08b786 · f08b786
2 parents 8564fdb + bb661ea
commit f08b786
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,6 +3,7 @@ if (utils.scm_checkout()) return
 env_vars = [
     "CRDS_SERVER_URL=https://jwst-crds.stsci.edu",
     "CRDS_PATH=./crds_cache",
+    "CRDS+CONTEXT=jwst_0500.pmap",
 ]
 
 // pip related setup for local index, not used currently

diff --git a/JenkinsfileRT b/JenkinsfileRT
@@ -42,7 +42,7 @@ bc.build_cmds = [
     "pip install pytest-xdist",
 ]
 bc.test_cmds = [
-    "pytest -r sx -v -n 30 --bigdata --slow \
+    "pytest -r sx -v -n 30 --bigdata --slow  \
     --basetemp=${pytest_basetemp}  --junit-xml=results.xml \
     jwst/tests_nightly/general"
 ]

diff --git a/jwst/associations/lib/rules_level2b.py b/jwst/associations/lib/rules_level2b.py
@@ -880,7 +880,7 @@ def __init__(self, *args, **kwargs):
             DMSAttrConstraint(
                 name='wfsc',
                 sources=['visitype'],
-                value='.+wfsc.+',
+                value='prime_wfsc_sensing_control',
                 force_unique=True
             ),
             DMSAttrConstraint(
@@ -889,6 +889,7 @@ def __init__(self, *args, **kwargs):
                 value='.+(?!nis_extcal).+',
                 force_unique=False,
             )
+
         ])
 
         # Now check and continue initialization.