From 6006bff6f30ec1190fafebb5330039a0321b76ad Mon Sep 17 00:00:00 2001 From: d33bs Date: Thu, 17 Oct 2024 17:17:30 -0600 Subject: [PATCH 1/5] bump: version 1.2.0 -> 1.2.1 --- CHANGELOG.md | 7 +++++++ CITATION.cff | 4 ++-- pyproject.toml | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08b5e27d..c59bd4f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## v1.2.1 (2024-10-17) +[Detailed release notes](https://github.com/cytomining/pycytominer/releases/tag/v1.2.1) + +### Fix + +- **citation**: fix citation.cff file formatting (#460) + ## v1.2.0 (2024-09-30) [Detailed release notes](https://github.com/cytomining/pycytominer/releases/tag/v1.2.0) diff --git a/CITATION.cff b/CITATION.cff index 485fa641..d10d0237 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,4 +1,4 @@ -cff-version: 1.2.0 +cff-version: 1.2.1 message: "If you have used pycytominer in your project, please cite us as:" authors: - family-names: Serrano @@ -85,7 +85,7 @@ authors: orcid: https://orcid.org/0000-0002-0503-9348 title: "Reproducible image-based profiling with Pycytominer" # This version is updated using `cz bump` command -version: "1.2.0" +version: "1.2.1" license: BSD-3-Clause repository-code: "https://github.com/cytomining/pycytominer" doi: 10.48550/arXiv.2311.13417 diff --git a/pyproject.toml b/pyproject.toml index 327378f6..2f5818a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -200,7 +200,7 @@ ignore_missing_imports = true [tool.commitizen] # This version is used for changelog tracking and is updated using `cz bump` -version = "1.2.0" +version = "1.2.1" name = "cz_conventional_commits" tag_format = "v$version" version_scheme = "pep440" From 29e85d3a8aca4db404670aca015124377c688739 Mon Sep 17 00:00:00 2001 From: d33bs Date: Fri, 18 Oct 2024 09:56:20 -0600 Subject: [PATCH 2/5] linting / fixes --- CHANGELOG.md | 1 + CITATION.cff | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c59bd4f9..03cd5386 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## v1.2.1 (2024-10-17) + [Detailed release notes](https://github.com/cytomining/pycytominer/releases/tag/v1.2.1) ### Fix diff --git a/CITATION.cff b/CITATION.cff index d10d0237..d109a0f7 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,4 +1,4 @@ -cff-version: 1.2.1 +cff-version: 1.2.0 message: "If you have used pycytominer in your project, please cite us as:" authors: - family-names: Serrano From 8d03c9cd0ce378ce4e2986e7b765784ce400f87c Mon Sep 17 00:00:00 2001 From: d33bs Date: Thu, 24 Oct 2024 08:59:57 -0600 Subject: [PATCH 3/5] typo in earlier comment related to release --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d5286f63..cd7467e5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: rev: "2.2.4" hooks: - id: pyproject-fmt - # validates CITATION.cff file formatting expecations + # validates CITATION.cff file formatting expectations - repo: https://github.com/citation-file-format/cffconvert rev: b6045d78aac9e02b039703b030588d54d53262ac hooks: From 16c64ee33d01f13d4c04eac6dbfbf782b1095eb1 Mon Sep 17 00:00:00 2001 From: d33bs Date: Wed, 20 Nov 2024 10:19:52 -0700 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03cd5386..cb03d327 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,26 @@ -## v1.2.1 (2024-10-17) - +## v1.2.1 (2024-11-20) [Detailed release notes](https://github.com/cytomining/pycytominer/releases/tag/v1.2.1) ### Fix - **citation**: fix citation.cff file formatting (#460) +### Refactor + +- **collate**: deprecationwarning for `collate` (#462) + +### Build + +- **python**: add python 3.12 compatibility (#475) +- **python**: bump minimum python version to 3.9 (#464) + +### CI + +- **pre-commit**: format pyproject.toml with pyproject-fmt (#453) +- **releases**: constrain PyPI GitHub Actions release trigger types (#458) +- **dependencies**: update setup python action dependencies and dependabot settings (#457) +- **dependabot**: enable auto poetry updates (#463) + ## v1.2.0 (2024-09-30) [Detailed release notes](https://github.com/cytomining/pycytominer/releases/tag/v1.2.0) From dd81d5c5275bc8859c8f3e8b6a262f9c20043467 Mon Sep 17 00:00:00 2001 From: d33bs Date: Wed, 20 Nov 2024 10:24:30 -0700 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb03d327..58fcf456 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## v1.2.1 (2024-11-20) + [Detailed release notes](https://github.com/cytomining/pycytominer/releases/tag/v1.2.1) ### Fix