Merge branch 'master' into HLA-1150_MVM-Failure_from_log_level_11_01_23

spacetelescope · Nov 1, 2023 · 360fb51 · 360fb51
2 parents 2fdf43b + f6c7278
commit 360fb51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -18,12 +18,14 @@ number of the code change for that issue.  These PRs can be viewed at:
     https://github.com/spacetelescope/drizzlepac/pulls
 
 
-3.6.2rc0 (unreleased)
+3.6.2rc2 (unreleased)
 =====================
+- At this time pin Astrocut to versions <=0.9 to avoid conflicts with urllib3
+  package.  [#1145]
 
 - Added functionality to allow the use of a two-column poller file. This is used
   to update the WFPC2 SVM aperture header keywords from the values in the poller 
-  file.
+  file. [#1683]
 
 - Removed the version restriction on matplotlib. [#1649]
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ dependencies = [
     'pandas',
     'spherical_geometry>=1.2.22',
     'astroquery>=0.4',
-    'astrocut',
+    'astrocut<=0.9',
     'photutils>1.5.0',
     'lxml',
     'PyPDF2',