Skip to content

Commit

Permalink
Merge pull request #139 from PainterQubits/develop
Browse files Browse the repository at this point in the history
Merge develop into main
  • Loading branch information
alexhad6 authored Nov 6, 2023
2 parents 18c4bc0 + 1256941 commit 5046a41
Show file tree
Hide file tree
Showing 9 changed files with 849 additions and 956 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ on:
- develop

env:
POETRY_VERSION: "1.6.1"
POETRY_VERSION: "1.7.0"
MAIN_PYTHON_VERSION: "3.9"

jobs:
ci:
strategy:
matrix:
python_version: ["3.9", "3.10", "3.11"]
python_version: ["3.9", "3.10", "3.11", "3.12"]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Poetry
run: pipx install poetry==${{ env.POETRY_VERSION }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ on:
types: [published]

env:
POETRY_VERSION: "1.6.1"
POETRY_VERSION: "1.7.0"

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Poetry
run: pipx install poetry==${{ env.POETRY_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build:
python: "3.10"
jobs:
post_create_environment:
- pip install poetry==1.5.1
- pip install poetry==1.6.1
- poetry config virtualenvs.create false
post_install:
- poetry install --without dev
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.10.1] (Nov 6 2023)

### Added

- Support for Python 3.12

## [0.10.0] (Aug 30 2023)

### Added
Expand Down Expand Up @@ -124,7 +130,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.0...develop
[unreleased]: https://github.com/PainterQubits/paramdb/compare/v0.10.1...develop
[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
[0.9.0]: https://github.com/PainterQubits/paramdb/releases/tag/v0.9.0
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ authors:
- family-names: "Hadley"
given-names: "Alex"
title: "ParamDB"
version: 0.10.0
date-released: 2023-08-30
version: 0.10.1
date-released: 2023-11-06
url: "https://github.com/PainterQubits/paramdb"
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
project = "ParamDB"
copyright = "2023, California Institute of Technology"
author = "Alex Hadley"
release = "0.10.0"
release = "0.10.1"

# General configuration
extensions = [
Expand Down
1,730 changes: 806 additions & 924 deletions poetry.lock

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "paramdb"
version = "0.10.0"
version = "0.10.1"
description = "Python package for storing and retrieving experiment parameters."
authors = ["Alex Hadley <[email protected]>"]
authors = ["Alex Hadley <[email protected]>"]
license = "BSD-3-Clause"
readme = "README.md"
repository = "https://github.com/PainterQubits/paramdb"

[tool.poetry.dependencies]
python = "^3.9"
typing-extensions = "^4.7.1"
sqlalchemy = "^2.0.20"
zstandard = "^0.21.0"
astropy = {version = "^5.3.2", optional = true}
python = ">=3.9,<3.13"
typing-extensions = "^4.8.0"
sqlalchemy = "^2.0.23"
zstandard = "^0.22.0"
astropy = {version = "^5.3.4", optional = true}

[tool.poetry.extras]
astropy = ["astropy"]

[tool.poetry.group.dev.dependencies]
pytest = "^7.4.0"
pytest = "^7.4.3"
pytest-cov = "^4.1.0"
flake8 = "^6.1.0"
pylint = "^2.17.5"
mypy = "^1.5.1"
black = "^23.7.0"
pylint = "^3.0.2"
mypy = "^1.6.1"
black = "^23.10.1"

[tool.poetry.group.docs.dependencies]
sphinx = "^7.2.4"
sphinx = "^7.2.6"
myst-parser = "^2.0.0"
furo = "^2023.8.19"
furo = "^2023.9.10"
sphinx-copybutton = "^0.5.2"
jupyter-sphinx = "^0.4.0"
ipykernel = "^6.25.1"
ipykernel = "^6.26.0"
sphinx-autobuild = "^2021.3.14"

[tool.pytest.ini_options]
addopts = ["--import-mode=importlib"]
[tool.mypy]
strict = true

[tool.pylint.basic]
good-names-rgxs = ["^[a-z][a-z0-9]?$"]
Expand All @@ -46,9 +50,5 @@ disable = ["too-few-public-methods"]
[tool.pylint.typecheck]
ignored-classes = ["sqlalchemy.orm.session.sessionmaker"]

[tool.mypy]
strict = true

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
[tool.pytest.ini_options]
addopts = ["--import-mode=importlib"]
4 changes: 4 additions & 0 deletions tests/helpers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
"""Helper functions for paramdb tests."""

# In Python 3.9, Pylint complains that field() cannot be used in parameter dataclasses,
# so we disable the rule here.
# pylint: disable=invalid-field-call

from __future__ import annotations
from typing import Any
from dataclasses import field
Expand Down

0 comments on commit 5046a41

Please sign in to comment.