Fix #571 deprecation warnings Python 3.12 (#585)

- Change default test.max_case_secs to 300, because a Sirepo test takes longer than 2min.

Author: robnagler

pykern/package_data/projex/projex/__init__.py.jinja

@@ -2,10 +2,10 @@
 
 {{ copyright_license_rst }}
 """
-import pkg_resources
+import importlib.metadata
 
 try:
     # We only have a version once the package is installed.
-    __version__ = pkg_resources.get_distribution("{{ name }}").version
-except pkg_resources.DistributionNotFound:
+    __version__ = importlib.metadata.version("{{ name }}")
+except importlib.metadata.PackageNotFoundError:
     pass

pykern/pkcli/github.py

@@ -18,6 +18,7 @@
 import pykern.pkcollections
 import os
 import os.path
+import pykern.pkcompat
 import re
 import subprocess
 import sys
@@ -268,7 +269,7 @@ def issue_update_alpha_pending(repo):
     g.login()
     for c in r.commits(
         sha="master",
-        since=datetime.datetime.now() - datetime.timedelta(minutes=24 * 60),
+        since=pykern.pkcompat.utcnow() - datetime.timedelta(minutes=24 * 60),
     ):
         m = re.search(r"([-\w]+/[-\w]+)?#(\d+)", c.message)
         if not m:
@@ -421,7 +422,7 @@ def _repos():
             return _try(lambda: self.list_org_repos(org, include_forks=True))
 
         # POSIT: timestamps are sorted in _clone()
-        self._date_d = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+        self._date_d = pykern.pkcompat.utcnow().strftime("%Y%m%d%H%M%S")
         with pkio.save_chdir(self._date_d, mkdir=True):
             for r in _repos():
                 pkdlog("{}: begin", r.full_name)
@@ -438,9 +439,9 @@ def _prev_backup(self, base, ext):
         return b[-1] if b else []
 
     def _purge(self):
-        expires = datetime.datetime.utcnow() - cfg.keep_days
+        expires = pykern.pkcompat.utcnow() - cfg.keep_days
         for d in pkio.sorted_glob("[0-9]" * len(self._date_d)):
-            t = datetime.datetime.utcfromtimestamp(d.stat().mtime)
+            t = datetime.datetime.fromtimestamp(d.stat().mtime, datetime.timezone.utc)
             if t < expires:
                 pkio.unchecked_remove(d)
 
@@ -488,7 +489,7 @@ def _issue(i, d):
             k = PKDict(state="all")
             if prev:
                 self._extract_backup(prev)
-                k.since = datetime.datetime.now() - datetime.timedelta(days=7)
+                k.since = pykern.pkcompat.utcnow() - datetime.timedelta(days=7)
             for i in _try(lambda: list(repo.issues(**k))):
                 _try(lambda: _issue(i, d))
             _tar(base)
@@ -627,7 +628,7 @@ def _release_title(channel, pending=False):
     x = (
         "[pending]"
         if pending
-        else datetime.datetime.utcnow()
+        else pykern.pkcompat.utcnow()
         .replace(
             microsecond=0,
         )

pykern/pkcli/projex.py

@@ -11,15 +11,15 @@
 from pykern.pkcollections import PKDict
 from pykern.pkdebug import pkdc, pkdp
 import copy
-import datetime
 import os
 import py.path
+import pykern.pkcompat
 import re
 import subprocess
 
 #: Default values
 DEFAULTS = {
-    "year": datetime.datetime.now().year,
+    "year": pykern.pkcompat.utcnow().year,
     "license": "apache2",
     "copyright_license_rst": """:copyright: Copyright (c) {year} {author}.  All Rights Reserved.
 :license: {license}""",

pykern/pkcli/rsmanifest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Create and read global and user manifests.
 
 :copyright: Copyright (c) 2017 RadiaSoft LLC.  All Rights Reserved.
@@ -33,9 +32,7 @@ def add_code(name, version, uri, source_d, virtual_env=None, pyenv=None):
         virtual_env (str): DEPRECATED
         pyenv (str): pyenv version
     """
-    from pykern import pkcollections
-    from pykern import pkio
-    from pykern import pkjson
+    from pykern import pkcollections, pkio, pkjson, pkcompat
     import datetime
     import json
 
@@ -58,7 +55,7 @@ def add_code(name, version, uri, source_d, virtual_env=None, pyenv=None):
         pyenv = _NO_PYENV
     v = values.codes.get(pyenv) or pkcollections.Dict()
     v[name.lower()] = pkcollections.Dict(
-        installed=datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
+        installed=pkcompat.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
         name=name,
         source_d=source_d,
         uri=uri,

pykern/pkcli/sim.py

@@ -1,11 +1,11 @@
-# -*- coding: utf-8 -*-
 """wrapper for running simulations
 
 :copyright: Copyright (c) 2017 RadiaSoft LLC.  All Rights Reserved.
 :license: http://www.apache.org/licenses/LICENSE-2.0.html
 """
-from __future__ import absolute_import, division, print_function
+
 from pykern import pkconfig
+import pykern.pkcompat
 
 #: Where we install files with pip
 _PYTHON_USER_BASE = "rsbase"
@@ -164,12 +164,11 @@ def _init_git():
     """Init git locally and to bitbucket"""
     from pykern import pkcli
     from pykern import pkio
-    import datetime
     import re
     import subprocess
 
     title = pkio.py_path().basename
-    v = datetime.datetime.utcnow().strftime("%Y%m%d-%H%M%S")
+    v = pykern.pkcompat.utcnow().strftime("%Y%m%d-%H%M%S")
     name = "sim-{}-{}".format(pkio.py_path().basename, v).lower()
     r, ctx = _git_api_request(
         "post",
@@ -240,14 +239,13 @@ def _rsmanifest():
     from pykern import pkjson
     from pykern.pkcli import rsmanifest
     import cpuinfo
-    import datetime
     import os
     import subprocess
 
     m = rsmanifest.read_all()
     m["sim"] = {
         "run": {
-            "datetime": datetime.datetime.utcnow().isoformat(),
+            "datetime": pykern.pkcompat.utcnow().isoformat(),
             "cpu_info": cpuinfo.get_cpu_info(),
             "pyenv": _pyenv_version(),
             # TODO(robnagler) can't include because of auth/credential

pykern/pkcli/test.py

@@ -10,9 +10,9 @@
 from pykern import pkunit
 from pykern.pkcollections import PKDict
 from pykern.pkdebug import pkdp
-import datetime
 import os
 import pykern.pkcli
+import pykern.pkcompat
 import re
 import signal
 import subprocess
@@ -22,7 +22,7 @@
 
 SUITE_D = "tests"
 _COROUTINE_NEVER_AWAITED = re.compile(
-    "(.+ coroutine \S+ was never awaited.*)", flags=re.MULTILINE
+    r"(.+ coroutine \S+ was never awaited.*)", flags=re.MULTILINE
 )
 _TEST_SKIPPED = re.compile(r"^.+\s+SKIPPED\s+\(.+\)$", flags=re.MULTILINE)
 _TEST_PY = re.compile(r"_test\.py$")
@@ -45,7 +45,7 @@
 
 _cfg = pkconfig.init(
     ignore_warnings=(False, bool, "override pytest's output of all warnings"),
-    max_case_secs=(120, pkconfig.parse_seconds, "max run time for a case"),
+    max_case_secs=(300, pkconfig.parse_seconds, "max run time for a case"),
     max_failures=(
         5,
         pkconfig.parse_positive_int,
@@ -120,7 +120,7 @@ def run(self):
         self.tries -= 1
         self.restartable = self.tries > 0
         self.process = self._start()
-        self.started = datetime.datetime.utcnow()
+        self.started = pykern.pkcompat.utcnow()
 
     def _exit(self, returncode, aborting):
         def _forced_fail(msg):
@@ -376,7 +376,7 @@ def _check_run_time(case, now):
                 case.kill_after_timeout(t)
 
         while self.cases:
-            n = datetime.datetime.utcnow()
+            n = pykern.pkcompat.utcnow()
             for c in self.cases:
                 if (m := c.is_done(aborting)) is None:
                     # wait for next loop

pykern/pkcompat.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Backwards and forward compatible Python utilities
 
 Functions here will be available forever, even when functions are
@@ -10,9 +9,10 @@
 
 :copyright: Copyright (c) 2015-2023 RadiaSoft LLC.  All Rights Reserved.
 :license: http://www.apache.org/licenses/LICENSE-2.0.html
-
 """
+
 # Limit pykern imports so avoid dependency issues for pkconfig
+import datetime
 import inspect
 import itertools
 import locale
@@ -96,6 +96,17 @@ def unicode_unescape(value):
     return value.encode("utf-8").decode("unicode-escape")
 
 
+def utcnow():
+    """Replace deprecated datetime.utcnow
+
+    datetime.UTC does not exist in 3.9 so easier to wrap here.
+
+    Returns:
+        datetime.datetime: current time in UTC
+    """
+    return datetime.datetime.now(datetime.timezone.utc)
+
+
 def zip_strict(*iterables):
     """`zip` where iterables must be exact.
 

pykern/pkdebug.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Logging or regex-controlled print statements
 
 We take the view that there are two types of logging: permanent
@@ -80,6 +79,7 @@ def my_function():
 :license: http://www.apache.org/licenses/LICENSE-2.0.html
 
 """
+
 from pykern import pkcompat
 from pykern import pkconfig
 from pykern import pkconst
@@ -351,7 +351,7 @@ def emit(self, record):
             ),
             lambda: (
                 record.process,
-                datetime.datetime.utcfromtimestamp(record.created),
+                datetime.datetime.fromtimestamp(record.created, datetime.timezone.utc),
             ),
             with_control=wc,
         )
@@ -565,7 +565,7 @@ def msg():
             return pkdformat(fmt, *args, **kwargs)
 
         def pid_time():
-            return (os.getpid(), datetime.datetime.utcnow())
+            return (os.getpid(), pkcompat.utcnow())
 
         def prefix():
             return pkinspect.Call(

pykern/pkresource.py

@@ -11,8 +11,29 @@
 import errno
 import glob
 import importlib
-import pkg_resources
 import os.path
+import sys
+
+from pykern.pkdebug import pkdp
+
+if sys.version_info < (3, 10):
+    # There's a bug resources.files() in 3.9.15 so need this.
+    # Also works with older versions than 3.9
+    import pkg_resources
+
+    def _resource_filename(package, path):
+        return pkg_resources.resource_filename(
+            package,
+            os.path.join(pkconst.PACKAGE_DATA, path),
+        )
+
+else:
+    import importlib.resources
+
+    def _resource_filename(package, path):
+        return str(
+            importlib.resources.files(package).joinpath(pkconst.PACKAGE_DATA, path)
+        )
 
 
 def file_path(relative_filename, caller_context=None, packages=None):
@@ -62,14 +83,13 @@ def glob_paths(relative_path, caller_context=None, packages=None):
         py.path: absolute paths of the matched files
     """
     r = []
-    a = []
     for f, p in _files(relative_path, caller_context, packages):
-        a.append(p)
         r.extend(glob.glob(f))
     return [pkio.py_path(f) for f in r]
 
 
 def _files(path, caller_context, packages):
+
     if caller_context and packages:
         raise ValueError(
             f"Use only one of caller_context={caller_context} and packages={packages}",
@@ -86,11 +106,7 @@ def _files(path, caller_context, packages):
         )
     ):
         yield (
-            # Will be fixed in https://github.com/radiasoft/pykern/issues/462
-            pkg_resources.resource_filename(
-                p,
-                os.path.join(pkconst.PACKAGE_DATA, path),
-            ),
+            _resource_filename(p, path),
             p,
         )
 

pykern/pksetup.py

@@ -415,7 +415,9 @@ def _version(base):
     global _cfg
 
     if not _cfg:
-        _cfg = pkconfig.init(no_version=(False, bool, "use utcnow as version"))
+        _cfg = pkconfig.init(
+            no_version=(False, bool, "use now(datetime.timezone.utc)s version")
+        )
     if _cfg.no_version:
         return _version_from_datetime(), None
     v1 = _version_from_pkg_info(base)
@@ -439,7 +441,9 @@ def _version_from_datetime(value=None):
     # Avoid 'UserWarning: Normalizing' by setuptools
     return str(
         packaging.version.Version(
-            (value or datetime.datetime.utcnow()).strftime("%Y%m%d.%H%M%S"),
+            (value or datetime.datetime.now(datetime.timezone.utc)).strftime(
+                "%Y%m%d.%H%M%S"
+            ),
         ),
     )