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 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