Skip to content

Commit 05a1aa1

Browse files
authored
Merge pull request #249731 from Homebrew/jrnl-python
jrnl: migrate to `[email protected]`
2 parents 8e36183 + cc9c6e0 commit 05a1aa1

File tree

1 file changed

+29
-31
lines changed

1 file changed

+29
-31
lines changed

Formula/j/jrnl.rb

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@ class Jrnl < Formula
99
head "https://github.com/jrnl-org/jrnl.git", branch: "develop"
1010

1111
bottle do
12-
sha256 cellar: :any_skip_relocation, arm64_tahoe: "1fef6b519f78c4e67d8bf3d1fcd42a5e839bdc935b9159e85dc6635c8053e84a"
13-
sha256 cellar: :any_skip_relocation, arm64_sequoia: "25ebc4285ec83ca5d14e3b82dac44745c7eab8e3ba799e3224379bccc18da0d3"
14-
sha256 cellar: :any_skip_relocation, arm64_sonoma: "25ebc4285ec83ca5d14e3b82dac44745c7eab8e3ba799e3224379bccc18da0d3"
15-
sha256 cellar: :any_skip_relocation, arm64_ventura: "25ebc4285ec83ca5d14e3b82dac44745c7eab8e3ba799e3224379bccc18da0d3"
16-
sha256 cellar: :any_skip_relocation, sonoma: "f949633a884a972b1b95e8d23f68a7530642d4a205de43e1e1c5497d56607ed7"
17-
sha256 cellar: :any_skip_relocation, ventura: "f949633a884a972b1b95e8d23f68a7530642d4a205de43e1e1c5497d56607ed7"
18-
sha256 cellar: :any_skip_relocation, arm64_linux: "f01d2c733150b3597a4fbc1153605db8bd40542bd2a3741127ccb8310f3e8982"
19-
sha256 cellar: :any_skip_relocation, x86_64_linux: "9eeb3e076ae9f7c2098d01e6712b1d8a78dfd5175827efefa6e947e9a1cd3c2c"
12+
rebuild 1
13+
sha256 cellar: :any_skip_relocation, arm64_tahoe: "3a0aa07ea418bf92b16ffa0de3810b2f9a460427088a2c06948510b957268a6d"
14+
sha256 cellar: :any_skip_relocation, arm64_sequoia: "660c3fac5223d641fe67326484ff153d1dce576410bc85cd5f1269fef4a10a24"
15+
sha256 cellar: :any_skip_relocation, arm64_sonoma: "f93190b1d6819089f5650abf602287354b8f500c2e665f4c8b6bb67805688a36"
16+
sha256 cellar: :any_skip_relocation, sonoma: "e830506df1e5db4fa6da27757a7f849db092d5cf61eb3b396bc63aef1ca81e3f"
17+
sha256 cellar: :any_skip_relocation, arm64_linux: "d1ab82a99a71c609cbc6122bb22f839fc8c8a63bfea5622936a60d3400fd06fe"
18+
sha256 cellar: :any_skip_relocation, x86_64_linux: "84f032f2eb6b3388b19e81b056361e0333c54f16958d9fdba8c7b4cee4e8acab"
2019
end
2120

22-
depends_on "cryptography"
21+
depends_on "cryptography" => :no_linkage
2322
depends_on "libyaml"
24-
depends_on "python@3.13"
23+
depends_on "python@3.14"
2524

2625
resource "colorama" do
2726
url "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz"
@@ -39,13 +38,8 @@ class Jrnl < Formula
3938
end
4039

4140
resource "jaraco-functools" do
42-
url "https://files.pythonhosted.org/packages/ab/23/9894b3df5d0a6eb44611c36aec777823fc2e07740dabbd0b810e19594013/jaraco_functools-4.1.0.tar.gz"
43-
sha256 "70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d"
44-
end
45-
46-
resource "jeepney" do
47-
url "https://files.pythonhosted.org/packages/d6/f4/154cf374c2daf2020e05c3c6a03c91348d59b23c5366e968feb198306fdf/jeepney-0.8.0.tar.gz"
48-
sha256 "5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"
41+
url "https://files.pythonhosted.org/packages/f7/ed/1aa2d585304ec07262e1a83a9889880701079dde796ac7b1d1826f40c63d/jaraco_functools-4.3.0.tar.gz"
42+
sha256 "cfd13ad0dd2c47a3600b439ef72d8615d482cedcff1632930d6f28924d92f294"
4943
end
5044

5145
resource "keyring" do
@@ -54,8 +48,8 @@ class Jrnl < Formula
5448
end
5549

5650
resource "markdown-it-py" do
57-
url "https://files.pythonhosted.org/packages/38/71/3b932df36c1a044d397a1f92d1cf91ee0a503d91e470cbd670aa66b07ed0/markdown-it-py-3.0.0.tar.gz"
58-
sha256 "e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"
51+
url "https://files.pythonhosted.org/packages/5b/f5/4ec618ed16cc4f8fb3b701563655a69816155e79e24a17b651541804721d/markdown_it_py-4.0.0.tar.gz"
52+
sha256 "cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3"
5953
end
6054

6155
resource "mdurl" do
@@ -64,8 +58,8 @@ class Jrnl < Formula
6458
end
6559

6660
resource "more-itertools" do
67-
url "https://files.pythonhosted.org/packages/88/3b/7fa1fe835e2e93fd6d7b52b2f95ae810cf5ba133e1845f726f5a992d62c2/more-itertools-10.6.0.tar.gz"
68-
sha256 "2cd7fad1009c31cc9fb6a035108509e6547547a7a738374f10bd49a09eb3ee3b"
61+
url "https://files.pythonhosted.org/packages/ea/5d/38b681d3fce7a266dd9ab73c66959406d565b3e85f21d5e66e1181d93721/more_itertools-10.8.0.tar.gz"
62+
sha256 "f638ddf8a1a0d134181275fb5d58b086ead7c6a72429ad725c67503f13ba30bd"
6963
end
7064

7165
resource "parsedatetime" do
@@ -74,8 +68,8 @@ class Jrnl < Formula
7468
end
7569

7670
resource "pygments" do
77-
url "https://files.pythonhosted.org/packages/7c/2d/c3338d48ea6cc0feb8446d8e6937e1408088a72a39937982cc6111d17f84/pygments-2.19.1.tar.gz"
78-
sha256 "61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f"
71+
url "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz"
72+
sha256 "636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887"
7973
end
8074

8175
resource "python-dateutil" do
@@ -94,13 +88,13 @@ class Jrnl < Formula
9488
end
9589

9690
resource "ruamel-yaml" do
97-
url "https://files.pythonhosted.org/packages/ea/46/f44d8be06b85bc7c4d8c95d658be2b68f27711f279bf9dd0612a5e4794f5/ruamel.yaml-0.18.10.tar.gz"
98-
sha256 "20c86ab29ac2153f80a428e1254a8adf686d3383df04490514ca3b79a362db58"
91+
url "https://files.pythonhosted.org/packages/3e/db/f3950f5e5031b618aae9f423a39bf81a55c148aecd15a34527898e752cf4/ruamel.yaml-0.18.15.tar.gz"
92+
sha256 "dbfca74b018c4c3fba0b9cc9ee33e53c371194a9000e694995e620490fd40700"
9993
end
10094

101-
resource "secretstorage" do
102-
url "https://files.pythonhosted.org/packages/53/a4/f48c9d79cb507ed1373477dbceaba7401fd8a23af63b837fa61f1dcd3691/SecretStorage-3.3.3.tar.gz"
103-
sha256 "2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77"
95+
resource "ruamel-yaml-clib" do
96+
url "https://files.pythonhosted.org/packages/d8/e9/39ec4d4b3f91188fad1842748f67d4e749c77c37e353c4e545052ee8e893/ruamel.yaml.clib-0.2.14.tar.gz"
97+
sha256 "803f5044b13602d58ea378576dd75aa759f52116a0232608e8fdada4da33752e"
10498
end
10599

106100
resource "six" do
@@ -109,11 +103,15 @@ class Jrnl < Formula
109103
end
110104

111105
resource "tzlocal" do
112-
url "https://files.pythonhosted.org/packages/33/cc/11360404b20a6340b9b4ed39a3338c4af47bc63f87f6cea94dbcbde07029/tzlocal-5.3.tar.gz"
113-
sha256 "2fafbfc07e9d8b49ade18f898d6bcd37ae88ce3ad6486842a2e4f03af68323d2"
106+
url "https://files.pythonhosted.org/packages/8b/2e/c14812d3d4d9cd1773c6be938f89e5735a1f11a9f184ac3639b93cef35d5/tzlocal-5.3.1.tar.gz"
107+
sha256 "cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd"
114108
end
115109

116110
def install
111+
# Unpin python for 3.14
112+
# PR ref: https://github.com/jrnl-org/jrnl/pull/2015
113+
inreplace "pyproject.toml", 'python = ">=3.10.0, <3.14"', 'python = ">=3.10.0"'
114+
117115
# The source doesn't have a valid SOURCE_DATE_EPOCH, so here we set default.
118116
ENV["SOURCE_DATE_EPOCH"] = "1451574000"
119117

@@ -132,7 +130,7 @@ def install
132130
# Encrypt the journal. Needs a TTY to read password.
133131
require "expect"
134132
require "pty"
135-
timeout = 3
133+
timeout = 5
136134
PTY.spawn(bin/"jrnl", "--encrypt") do |r, w, pid|
137135
refute_nil r.expect("Enter password for journal 'default': ", timeout), "Expected password input"
138136
w.write "homebrew\r"

0 commit comments

Comments
 (0)