Merge branch 'main' into MAINT_adding_py313

Author: agoose77

.github/workflows/tests.yml

@@ -2,25 +2,17 @@ name: continuous-integration
 
 on:
   push:
-    branches: [master]
+    branches:
+    - main
     tags:
-      - 'v*'
+    - '*'
   pull_request:
+  schedule:
+    - cron:  '0 5 * * 1'
+  workflow_dispatch:
 
 
 jobs:
-  pre-commit:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.9"
-    - uses: pre-commit/action@v3.0.0
-
   tests:
 
     strategy:
@@ -35,9 +27,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true
@@ -68,9 +60,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout source
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.10"
     - name: install flit

.pre-commit-config.yaml

@@ -6,6 +6,9 @@ exclude: >
       \.vscode/settings\.json
     )$
 
+ci:
+  autoupdate_schedule: 'monthly'
+
 repos:
 
   - repo: https://github.com/pre-commit/pre-commit-hooks

jupyter_cache/cache/db.py

@@ -1,5 +1,5 @@
 from contextlib import contextmanager
-from datetime import datetime
+import datetime
 import os
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Union
@@ -51,6 +51,10 @@ def get_version(path: Union[str, Path]) -> Optional[str]:
         return version_file.read_text().strip()
 
 
+def datetime_utcnow():
+    return lambda: datetime.datetime.now(datetime.timezone.utc)
+
+
 @contextmanager
 def session_context(engine: Engine):
     """Open a connection to the database."""
@@ -128,7 +132,7 @@ class NbProjectRecord(OrmBase):
     """A list of file assets required for the notebook to run."""
     exec_data = Column(JSON(), nullable=True)
     """Data on how to execute the notebook."""
-    created = Column(DateTime, nullable=False, default=datetime.utcnow)
+    created = Column(DateTime, nullable=False, default=datetime_utcnow())
     traceback = Column(Text(), nullable=True, default="")
     """A traceback is added if a notebook fails to execute fully."""
 
@@ -288,9 +292,9 @@ class NbCacheRecord(OrmBase):
     description = Column(String(255), nullable=False, default="")
     data = Column(JSON())
     """Extra data, such as the execution time."""
-    created = Column(DateTime, nullable=False, default=datetime.utcnow)
+    created = Column(DateTime, nullable=False, default=datetime_utcnow())
     accessed = Column(
-        DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow
+        DateTime, nullable=False, default=datetime_utcnow(), onupdate=datetime_utcnow()
     )
 
     def __repr__(self):
@@ -368,7 +372,7 @@ def touch(pk, db: Engine):
             record = session.query(NbCacheRecord).filter_by(pk=pk).one_or_none()
             if record is None:
                 raise KeyError(f"Cache record not found for NB with PK: {pk}")
-            record.accessed = datetime.utcnow()
+            record.accessed = datetime_utcnow()()
             session.commit()
 
     def touch_hashkey(hashkey, db: Engine):
@@ -379,7 +383,7 @@ def touch_hashkey(hashkey, db: Engine):
             )
             if record is None:
                 raise KeyError(f"Cache record not found for NB with hashkey: {hashkey}")
-            record.accessed = datetime.utcnow()
+            record.accessed = datetime_utcnow()()
             session.commit()
 
     @staticmethod

pyproject.toml

@@ -72,7 +72,7 @@ testing = [
     "nbformat>=5.1",
     "numpy",
     "pandas",
-    "pytest>=6,<8",
+    "pytest>=6",
     "pytest-cov",
     "pytest-regressions",
     "sympy",