Skip to content

Commit 7a92466

Browse files
authored
Merge pull request #28 from gene1wood/specify_dependency_versions
Set dependency versions
2 parents 1a0fc4b + 0ae8916 commit 7a92466

File tree

4 files changed

+66
-18
lines changed

4 files changed

+66
-18
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v5
24-
- name: Set up Python 3.13
24+
- name: Set up Python 3.14
2525
uses: actions/setup-python@v6
2626
with:
27-
python-version: "3.13"
27+
python-version: "3.14"
2828
cache: 'pip'
2929
- name: Install dependencies
3030
run: |

CHANGELOG.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Changelog
2+
3+
## [1.2.0] - 2025-12-17
4+
5+
### Changed
6+
7+
- Change unit test regex comparison of tool output so that errors are clearer. ([#19](https://github.com/mozilla/hsm-orchestrator/pull/19)) (Gene Wood)
8+
- Change minimum Python version to 3.10 ([#28](https://github.com/mozilla/hsm-orchestrator/issues/28)) (Gene Wood)
9+
10+
### Added
11+
12+
- Add a new check if the filenames of the .csr .cnf pair match an existing cert ([#27](https://github.com/mozilla/hsm-orchestrator/pull/27)) (Gene Wood)
13+
- Add a check and fix of filesystem permissions, specifically the execute bits of files on the USB stick ([#25](https://github.com/mozilla/hsm-orchestrator/pull/25)) (Gene Wood)
14+
- Add a check to confirm the USB stick is using a filesystem that the Offline HSM can recognize ([#21](https://github.com/mozilla/hsm-orchestrator/pull/21)) (Gene Wood)
15+
- Add a check for the openssl.cnf setting of `unique_subject=yes` and prompts the user to change it ([#17](https://github.com/mozilla/hsm-orchestrator/pull/17)) (Gene Wood)
16+
- Add a check if the `simple_test` private key is being used and warn the user ([#23](https://github.com/mozilla/hsm-orchestrator/pull/23)) (Gene Wood)
17+
- Add minimum versions for dependencies ([#28](https://github.com/mozilla/hsm-orchestrator/issues/28)) (Gene Wood)
18+
19+
### Fixed
20+
21+
- Fix case where the `certs_issued` directory is missing by creating it ([#24](https://github.com/mozilla/hsm-orchestrator/pull/24)) (Gene Wood)
22+
- Fix overly wide `pull-from-stick` output so it's readable ([#20](https://github.com/mozilla/hsm-orchestrator/pull/20)) (Gene Wood)
23+
24+
## [1.1.0] - 2025-09-19
25+
26+
### Changed
27+
28+
- **Breaking:** Rename `push` and `pull` actions and add post-pull next steps ([#6]( https://github.com/mozilla/hsm-orchestrator/pull/6)) (Gene Wood)
29+
30+
### Added
31+
32+
- Add support for git repos which have an `https` remote instead of `ssh` ([#3](https://github.com/mozilla/hsm-orchestrator/pull/3)) (Gene Wood)
33+
34+
## [1.0.2] - 2025-09-12
35+
36+
_First publish to PyPi._
37+
38+
## [1.0.1] - 2025-09-12
39+
40+
_Initial release._
41+
42+
[1.2.0]: https://github.com/mozilla/hsm-orchestrator/releases/tag/v1.2.0
43+
44+
[1.1.0]: https://github.com/mozilla/hsm-orchestrator/releases/tag/v1.1.0
45+
46+
[1.0.2]: https://github.com/mozilla/hsm-orchestrator/releases/tag/v1.0.2
47+
48+
[1.0.1]: https://github.com/mozilla/hsm-orchestrator/releases/tag/v1.0.1

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ It provides commands to:
88
* Push the necessary files to a USB stick for transfer to an offline HSM.
99
* Pull back the signed certificate and updated Certificate Authority (CA) files from a USB stick.
1010

11-
[![PyPI - Version](https://img.shields.io/pypi/v/hsm-orchestrator)](https://pypi.org/project/hsm-orchestrator/) [![Tests](https://github.com/mozilla/hsm-orchestrator/actions/workflows/tests.yml/badge.svg)](https://github.com/mozilla/hsm-orchestrator/actions/workflows/tests.yml)
11+
[![PyPI - Version](https://img.shields.io/pypi/v/hsm-orchestrator)](https://pypi.org/project/hsm-orchestrator/) [![Tests](https://github.com/mozilla/hsm-orchestrator/actions/workflows/tests.yml/badge.svg)](https://github.com/mozilla/hsm-orchestrator/actions/workflows/tests.yml) [![Common Changelog](https://common-changelog.org/badge.svg)](https://common-changelog.org)
1212

1313
---
1414

@@ -102,7 +102,7 @@ move the files off of the USB stick and into the correct directories in the hsm
102102

103103
## Requirements
104104

105-
* **Python** ≥ 3.9
105+
* **Python** ≥ 3.10
106106
* Dependencies (installed automatically):
107107

108108
* [click](https://click.palletsprojects.com/) for CLI arguments

pyproject.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "hsm-orchestrator"
7-
version = "1.1.0"
7+
version = "1.2.0"
88
description = "Orchestration tool for Mozilla's offline HSM which facilitates conveying a CSR to the air gapped HSM server"
99
readme = "README.md"
10-
requires-python = ">=3.9"
10+
requires-python = ">=3.10"
1111
license = { file = "LICENSE.txt" }
1212
keywords = ["hsm"]
1313
authors = [{ name = "Gene Wood", email = "gene@mozilla.com" }]
@@ -22,28 +22,28 @@ classifiers = [
2222
"Topic :: Security :: Cryptography",
2323
"License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
2424
"Programming Language :: Python :: 3",
25-
"Programming Language :: Python :: 3.9",
2625
"Programming Language :: Python :: 3.10",
2726
"Programming Language :: Python :: 3.11",
2827
"Programming Language :: Python :: 3.12",
2928
"Programming Language :: Python :: 3.13",
29+
"Programming Language :: Python :: 3.14",
3030
"Programming Language :: Python :: 3 :: Only",
3131
]
3232
dependencies = [
33-
"click",
34-
"rich",
35-
"platformdirs",
36-
"GitPython",
37-
"psutil",
38-
"configobj",
33+
"click~=8.3.0",
34+
"rich~=14.1.0",
35+
"platformdirs~=4.4.0",
36+
"GitPython~=3.1.45",
37+
"psutil~=7.1.0",
38+
"configobj~=5.0.9",
3939
]
4040

4141
[project.optional-dependencies]
4242
test = [
43-
"coverage",
44-
"pytest",
45-
"pytest-datafiles",
46-
"click"
43+
"coverage~=7.10.6",
44+
"pytest~=8.4.2",
45+
"pytest-datafiles~=3.0.0",
46+
"click~=8.3.0"
4747
]
4848

4949
[project.urls]
@@ -57,7 +57,7 @@ test = [
5757
hsm-orchestrator = "hsm_orchestrator:main"
5858

5959
[tool.pytest.ini_options]
60-
minversion = "6.0"
60+
minversion = "8.4.2"
6161
# addopts = "--capture=no --log-cli-level=10"
6262
addopts = "--capture=no"
6363
testpaths = [

0 commit comments

Comments
 (0)