From 9f3cba3c573cf45c75734bd42a01b9909a1de8e1 Mon Sep 17 00:00:00 2001
From: Pey Lian Lim <2090236+pllim@users.noreply.github.com>
Date: Tue, 22 Jun 2021 15:57:22 -0400
Subject: [PATCH 1/2] MNT: Replace deprecated dtypes.

---
 acstools/acs_destripe.py | 8 ++++----
 acstools/satdet.py       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acstools/acs_destripe.py b/acstools/acs_destripe.py
index b71eef53..d5d353c3 100644
--- a/acstools/acs_destripe.py
+++ b/acstools/acs_destripe.py
@@ -643,13 +643,13 @@ def clean_streak(image, stat="pmode1", maxiter=15, sigrej=2.0,
 
     # array to hold cumulative stripe amplitudes and latest row npix:
     cumcorr = np.zeros(image.science.shape[0], dtype=np.float64)
-    cnpix = np.zeros(image.science.shape[0], dtype=np.int)
+    cnpix = np.zeros(image.science.shape[0], dtype=int)
 
     # other arrays
     corr_scale = np.empty(image.science.shape[0], dtype=np.float64)
-    npix = np.empty(image.science.shape[0], dtype=np.int)
+    npix = np.empty(image.science.shape[0], dtype=int)
     sigcorr2 = np.zeros(image.science.shape[0], dtype=np.float64)
-    updrows = np.zeros(image.science.shape[0], dtype=np.int)
+    updrows = np.zeros(image.science.shape[0], dtype=int)
 
     # for speed-up and to reduce rounding errors in ERR computations,
     # keep a copy of the squared error array:
@@ -989,7 +989,7 @@ def djs_iterstat(InputArr, MaxIter=10, SigRej=3.0,
         else:
             break
 
-    logical_mask = SaveMask.astype(np.bool)
+    logical_mask = SaveMask.astype(bool)
 
     if NLast > 1:
         FMedian = np.median(InputArr[logical_mask])
diff --git a/acstools/satdet.py b/acstools/satdet.py
index 13ae1267..dc804618 100644
--- a/acstools/satdet.py
+++ b/acstools/satdet.py
@@ -838,7 +838,7 @@ def make_mask(filename, ext, trail_coords, sublen=75, subwidth=200, order=3,
             f'{image.shape}', AstropyUserWarning)
 
     # Change to boolean mask
-    mask = mask.astype(np.bool)
+    mask = mask.astype(bool)
 
     if plot and plt is not None:
         # debugging array

From 3537b33d6b5d3e7d1db3d1adedc67aecee1c0709 Mon Sep 17 00:00:00 2001
From: Pey Lian Lim <2090236+pllim@users.noreply.github.com>
Date: Tue, 22 Jun 2021 16:09:00 -0400
Subject: [PATCH 2/2] TST: Bump Python version

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7e8a9b5a..996d81ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ bc1.name = "release"
 // Would be nice if Jenkins can access /grp/hst/cdbs/xxxx directly.
 bc1.env_vars = ['TEST_BIGDATA=https://bytesalad.stsci.edu/artifactory']
 bc1.conda_channels = ['http://ssb.stsci.edu/astroconda']
-bc1.conda_packages = ['python=3.6']
+bc1.conda_packages = ['python=3.7']
 bc1.build_cmds = ["pip install -e .[test,all]"]
 bc1.test_cmds = ["pytest --basetemp=tests_output --junitxml results.xml --bigdata -v"]
 bc1.failedUnstableThresh = 1