Skip to content

Commit

Permalink
Loosen p7zip_jll compatibility (#485)
Browse files Browse the repository at this point in the history
* Julia 1.7 ordering of Project.toml

* Increase compatibility with p7zip_jll

* Test with force_latest_compatible_version

* Set project version to 1.21.1

* drop! Confirm test catches compat issue

* Revert "drop! Confirm test catches compat issue"

This reverts commit 1882945.
  • Loading branch information
omus authored Feb 4, 2025
1 parent bafec99 commit aae087d
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 9 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,28 @@ jobs:
env:
JULIA_DEPOT_PATH: sysimage-depot

force-latest-compatible:
name: Force Latest Compatible - Julia ${{ matrix.version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- "1.7"
os:
- windows-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
- uses: julia-actions/cache@v2
- name: Test
shell: julia --color=yes --project {0}
run: |
using Pkg
Pkg.test(; allow_reresolve=true, force_latest_compatible_version=true)
benchmarks:
name: Benchmarks
runs-on: ubuntu-latest
Expand Down
18 changes: 9 additions & 9 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "TimeZones"
uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53"
authors = ["Curtis Vogt <curtis.vogt@gmail.com>"]
version = "1.21.0"
version = "1.21.1"

[deps]
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
Expand All @@ -16,15 +16,9 @@ TZJData = "dc5dba14-91b3-4cab-a142-028a31da12f7"
Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
p7zip_jll = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"

[weakdeps]
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"

[extensions]
TimeZonesRecipesBaseExt = "RecipesBase"

[compat]
Artifacts = "1"
Aqua = "0.8"
Artifacts = "1"
Dates = "1"
Downloads = "1"
InlineStrings = "1"
Expand All @@ -36,7 +30,10 @@ TZJData = "1"
Test = "1"
Unicode = "1"
julia = "1.6"
p7zip_jll = "17.4"
p7zip_jll = "16, 17"

[extensions]
TimeZonesRecipesBaseExt = "RecipesBase"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Expand All @@ -45,3 +42,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Aqua", "Test", "RecipesBase"]

[weakdeps]
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"

2 comments on commit aae087d

@omus
Copy link
Member Author

@omus omus commented on aae087d Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/124330

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.21.1 -m "<description of version>" aae087d9656340c9306dcb13b3183ff74d6c07d1
git push origin v1.21.1

Please sign in to comment.