Merge pull request #2488 from meeseeksmachine/auto-backport-of-pr-247…

…3-on-v3.7.x Backport PR #2473 on branch v3.7.x (TST: Python 3.12)
spacetelescope · Sep 29, 2023 · 45c7829 · 45c7829
2 parents fc17771 + 57aaaf7
commit 45c7829
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
@@ -44,10 +44,10 @@ jobs:
             toxenv: securityaudit
             allow_failure: false
 
-          - name: Python 3.10 with coverage checking, all deps, and remote data
+          - name: Python 3.11 with coverage checking, all deps, and remote data
             os: ubuntu-latest
-            python: '3.10'
-            toxenv: py310-test-alldeps-cov
+            python: '3.11'
+            toxenv: py311-test-alldeps-cov
             toxposargs: --remote-data
             allow_failure: false
 
@@ -57,18 +57,18 @@ jobs:
             toxenv: py39-test
             allow_failure: false
 
-          - name: Windows - Python 3.9
+          - name: Windows - Python 3.10
             os: windows-latest
-            python: 3.9
-            toxenv: py39-test
+            python: '3.10'
+            toxenv: py310-test
             allow_failure: false
 
           # This also runs on cron but we want to make sure new changes
           # won't break this job at the PR stage.
-          - name: Python 3.11 with latest dev versions of key dependencies, and remote data
+          - name: Python 3.12 with latest dev versions of key dependencies, and remote data
             os: ubuntu-latest
-            python: '3.11'
-            toxenv: py311-test-devdeps
+            python: '3.12-dev'
+            toxenv: py312-test-devdeps
             toxposargs: --remote-data --run-slow
             allow_failure: true
 

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -24,6 +24,11 @@ Specviz
 Specviz2d
 ^^^^^^^^^
 
+Other Changes and Additions
+---------------------------
+
+- Compatibility with Python 3.12. [#2473]
+
 3.7 (2023-09-21)
 ================
 

diff --git a/jdaviz/configs/imviz/plugins/aper_phot_simple/aper_phot_simple.py b/jdaviz/configs/imviz/plugins/aper_phot_simple/aper_phot_simple.py
@@ -1,6 +1,6 @@
 import os
 import warnings
-from datetime import datetime
+from datetime import datetime, timezone
 
 import astropy
 import numpy as np
@@ -312,7 +312,7 @@ def vue_do_aper_phot(self, *args, **kwargs):
             phot_table.add_columns(
                 [xcenter * u.pix, ycenter * u.pix, sky_center,
                  bg, pixarea_fac, sum_ct, sum_ct_err, ctfac, sum_mag, flux_scale, data.label,
-                 reg.meta.get('label', ''), Time(datetime.utcnow())],
+                 reg.meta.get('label', ''), Time(datetime.now(tz=timezone.utc))],
                 names=['xcenter', 'ycenter', 'sky_center', 'background', 'pixarea_tot',
                        'aperture_sum_counts', 'aperture_sum_counts_err', 'counts_fac',
                        'aperture_sum_mag', 'flux_scaling',

diff --git a/pyproject.toml b/pyproject.toml
@@ -137,6 +137,7 @@ filterwarnings = [
     "ignore:The unit 'Angstrom' has been deprecated in the VOUnit standard\\. Suggested.* 0\\.1nm\\.",
     "ignore:specutils uses the deprecated entry point asdf_extensions",
     "ignore:((.|\n)*)Sentinel is not a public part of the traitlets API((.|\n)*)",
+    "ignore:datetime\\.datetime\\.utcfromtimestamp:DeprecationWarning",  # asdf + dateutil<=2.8.2 + Python 3.12
     "ignore::DeprecationWarning:glue",
     "ignore::DeprecationWarning:bqplot",
     "ignore::DeprecationWarning:bqplot_image_gl",

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{38,39,310,311}-test{,-alldeps,-devdeps,-predeps}{-romandeps}{,-cov}
+    py{38,39,310,311,312}-test{,-alldeps,-devdeps,-predeps}{-romandeps}{,-cov}
     linkcheck
     codestyle
     pep517