Skip to content

Commit

Permalink
feat: update to openjd-sessions 0.7.*
Browse files Browse the repository at this point in the history
Signed-off-by: Morgan Epp <[email protected]>
  • Loading branch information
epmog committed Mar 11, 2024
1 parent 0dfe223 commit 3f6257c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 11 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release_bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
# Run semantic-release to generate new changelog
pip install --upgrade hatch
hatch env create release
hatch run release:deps
NEXT_SEMVER=$(hatch run release:bump $BUMP_ARGS)
# Grab the new version's changelog and prepend it to the original changelog contents
Expand Down
6 changes: 2 additions & 4 deletions hatch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sync = "pip install -r requirements-testing.txt"
test = "pytest --cov-config pyproject.toml {args:test}"
typing = "mypy {args:src test}"
style = [
"ruff {args:.}",
"ruff check {args:.}",
"black --check --diff {args:.}",
]
fmt = [
Expand All @@ -28,10 +28,8 @@ build = "hatch build"

[envs.release]
detached = true
dependencies = [
"python-semantic-release == 8.7.*"
]

[envs.release.scripts]
deps = "pip install -r requirements-release.txt"
bump = "semantic-release -v --strict version --no-push --no-commit --no-tag --skip-build {args}"
version = "semantic-release -v --strict version --print {args}"
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
"Intended Audience :: End Users/Desktop"
]
dependencies = [
"openjd-sessions == 0.5.*",
"openjd-sessions == 0.7.*",
"openjd-model == 0.4.*"
]

Expand Down Expand Up @@ -97,7 +97,7 @@ disallow_incomplete_defs = false
disallow_untyped_calls = false
show_error_context = true
strict_equality = false
python_version = 3.9
python_version = "3.9"
warn_redundant_casts = true
warn_unused_configs = true
warn_unused_ignores = false
Expand Down
4 changes: 1 addition & 3 deletions requirements-release.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# HACK: This file solely exists for dependabot checks. The actual dependencies are in `hatch.toml` in the `release` environment.
# If dependabot opens a PR that modifies this file, please make sure to update the coresponding dependency in `hatch.toml` as well.
python-semantic-release == 8.7.*
python-semantic-release == 9.1.*
2 changes: 1 addition & 1 deletion requirements-testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pytest == 8.0.*
pytest-cov == 4.1.*
pytest-timeout == 2.2.*
pytest-xdist == 3.5.*
types-PyYAML ~= 6.0
types-PyYAML == 6.*
black == 24.*
ruff == 0.3.*
mypy == 1.8.*
2 changes: 1 addition & 1 deletion test/openjd/cli/test_run_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ def test_do_run_path_mapping_rules(caplog: pytest.LogCaptureFixture):
if os.name == "posix":
assert any("Mapped:/mnt/test" in m for m in caplog.messages)
else:
assert any(r"Mapped:\\mnt\\test" in m for m in caplog.messages)
assert any(r"Mapped:\mnt\test" in m for m in caplog.messages)
finally:
if temp_rules:
Path(temp_rules.name).unlink()
Expand Down

0 comments on commit 3f6257c

Please sign in to comment.