Merge pull request #145 from PainterQubits/develop

Merge develop into main

Author: alexhad6

.github/dependabot.yml

@@ -3,11 +3,11 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     target-branch: "develop"
 
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     target-branch: "develop"

.github/workflows/ci.yml

@@ -11,8 +11,9 @@ on:
       - develop
 
 env:
-  POETRY_VERSION: "1.7.0"
+  POETRY_VERSION: "1.7.1"
   MAIN_PYTHON_VERSION: "3.9"
+  PACKAGE_NAME: "paramdb"
 
 jobs:
   ci:
@@ -38,15 +39,15 @@ jobs:
 
       - name: Check formatting (Black)
         if: matrix.python_version == env.MAIN_PYTHON_VERSION
-        run: poetry run black paramdb tests --check
+        run: poetry run black ${{ env.PACKAGE_NAME }} tests --check
 
       - name: Lint (Flake8)
         if: matrix.python_version == env.MAIN_PYTHON_VERSION
-        run: poetry run flake8 paramdb tests
+        run: poetry run flake8 ${{ env.PACKAGE_NAME }} tests
 
       - name: Lint (Pylint)
         if: matrix.python_version == env.MAIN_PYTHON_VERSION
-        run: poetry run pylint paramdb tests
+        run: poetry run pylint ${{ env.PACKAGE_NAME }} tests
 
       - name: Mypy cache
         if: matrix.python_version == env.MAIN_PYTHON_VERSION
@@ -59,15 +60,15 @@ jobs:
 
       - name: Type check (Mypy)
         if: matrix.python_version == env.MAIN_PYTHON_VERSION
-        run: poetry run mypy paramdb tests
+        run: poetry run mypy ${{ env.PACKAGE_NAME }} tests
 
       - name: Test (Pytest)
         if: matrix.python_version != env.MAIN_PYTHON_VERSION
         run: poetry run pytest
 
       - name: Test (Pytest) with coverage
         if: matrix.python_version == env.MAIN_PYTHON_VERSION
-        run: poetry run pytest --cov=paramdb --cov-report=xml
+        run: poetry run pytest --cov=${{ env.PACKAGE_NAME }} --cov-report=xml
 
       - name: Upload coverage reports to Codecov
         if: matrix.python_version == env.MAIN_PYTHON_VERSION

CHANGELOG.md

@@ -7,6 +7,13 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.10.2] (Dec 5 2023)
+
+### Changed
+
+- Change supported Python versions from `>=3.9,<3.13` to `^3.9` for better compatibility
+  with other Poetry projects and future versions of Python.
+
 ## [0.10.1] (Nov 6 2023)
 
 ### Added
@@ -130,7 +137,8 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Database class `ParamDB` to store parameters in a SQLite file
 - Ability to retrieve the commit history as `CommitEntry` objects
 
-[unreleased]: https://github.com/PainterQubits/paramdb/compare/v0.10.1...develop
+[unreleased]: https://github.com/PainterQubits/paramdb/compare/v0.10.2...develop
+[0.10.2]: https://github.com/PainterQubits/paramdb/releases/tag/v0.10.2
 [0.10.1]: https://github.com/PainterQubits/paramdb/releases/tag/v0.10.1
 [0.10.0]: https://github.com/PainterQubits/paramdb/releases/tag/v0.10.0
 [0.9.1]: https://github.com/PainterQubits/paramdb/releases/tag/v0.9.1

CITATION.cff

@@ -4,6 +4,6 @@ authors:
   - family-names: "Hadley"
     given-names: "Alex"
 title: "ParamDB"
-version: 0.10.1
-date-released: 2023-11-06
+version: 0.10.2
+date-released: 2023-12-05
 url: "https://github.com/PainterQubits/paramdb"

docs/conf.py

@@ -4,7 +4,7 @@
 project = "ParamDB"
 copyright = "2023, California Institute of Technology"
 author = "Alex Hadley"
-release = "0.10.1"
+release = "0.10.2"
 
 # General configuration
 extensions = [

poetry.lock

@@ -4,38 +4,38 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "paramdb"
-version = "0.10.1"
+version = "0.10.2"
 description = "Python package for storing and retrieving experiment parameters."
 authors = ["Alex Hadley <contact@alexhadley.net>"]
 license = "BSD-3-Clause"
 readme = "README.md"
 repository = "https://github.com/PainterQubits/paramdb"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.13"
+python = "^3.9"
 typing-extensions = "^4.8.0"
 sqlalchemy = "^2.0.23"
 zstandard = "^0.22.0"
-astropy = {version = "^5.3.4", optional = true}
+astropy = { version = "^6.0.0", optional = true }
 
 [tool.poetry.extras]
 astropy = ["astropy"]
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.4.3"
-pytest-cov = "^4.1.0"
+mypy = "^1.7.1"
 flake8 = "^6.1.0"
 pylint = "^3.0.2"
-mypy = "^1.6.1"
-black = "^23.10.1"
+black = "^23.11.0"
+pytest = "^7.4.3"
+pytest-cov = "^4.1.0"
 
 [tool.poetry.group.docs.dependencies]
 sphinx = "^7.2.6"
 myst-parser = "^2.0.0"
 furo = "^2023.9.10"
 sphinx-copybutton = "^0.5.2"
 jupyter-sphinx = "^0.4.0"
-ipykernel = "^6.26.0"
+ipykernel = "^6.27.1"
 sphinx-autobuild = "^2021.3.14"
 
 [tool.mypy]

pyproject.toml

@@ -6,7 +6,7 @@
 from tests.helpers import CustomParamList, CustomParamDict
 from paramdb import ParamData, ParamList, ParamDict
 
-ParamCollection = Union[ParamList, ParamDict]
+ParamCollection = Union[ParamList[Any], ParamDict[Any]]
 Contents = Union[list[Any], dict[str, Any]]
 CustomParamCollection = Union[CustomParamList, CustomParamDict]