Skip to content

Commit 97c6a82

Browse files
dycwweb-flow
andauthored
Increase sleep on gitea merge from 1s -> 5s (#803)
Co-authored-by: github-actions-bot <noreply@github.com>
1 parent 06bbaed commit 97c6a82

File tree

6 files changed

+119
-109
lines changed

6 files changed

+119
-109
lines changed

.bumpversion.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

fish/git.fish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ function __gitea_merge
998998
set i (math $i+1)
999999
set elapsed (math (date +%s) - $start)
10001000
echo "'$repo/$curr_branch' is still merging... ($i, $elapsed s)"
1001-
sleep 1
1001+
sleep 5
10021002
end
10031003
set -l def_branch (git default-local-branch); or return $status
10041004
set -l args

nvim/lazy-lock.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"blink.cmp": {
1515
"branch": "main",
16-
"commit": "b19413d214068f316c78978b08264ed1c41830ec"
16+
"commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d"
1717
},
1818
"bufferline.nvim": {
1919
"branch": "main",
@@ -49,7 +49,7 @@
4949
},
5050
"gitsigns.nvim": {
5151
"branch": "main",
52-
"commit": "1ce96a464fdbc24208e24c117e2021794259005d"
52+
"commit": "31217271a7314c343606acb4072a94a039a19fb5"
5353
},
5454
"grug-far.nvim": {
5555
"branch": "main",
@@ -81,7 +81,7 @@
8181
},
8282
"leap.nvim": {
8383
"branch": "main",
84-
"commit": "d7316deae68dc93d6957020cdda6d7bb399218fb"
84+
"commit": "9a26da7a14c09cd84c05a4e8326890ef0f92a590"
8585
},
8686
"lualine.nvim": {
8787
"branch": "master",
@@ -101,7 +101,7 @@
101101
},
102102
"mini.snippets": {
103103
"branch": "main",
104-
"commit": "b4065ca6b33e4df2897672d3bb760cfc93f4390a"
104+
"commit": "a5e5ff2ff2223aff3fc33e6856935f02337b0ccf"
105105
},
106106
"mkdir.nvim": {
107107
"branch": "main",
@@ -113,7 +113,7 @@
113113
},
114114
"nvim-early-retirement": {
115115
"branch": "main",
116-
"commit": "702c18c66673fe068e5112e479027ca348266871"
116+
"commit": "05f50eb61d3303678981c7510c126204ac5af4f0"
117117
},
118118
"nvim-lastplace": {
119119
"branch": "main",
@@ -137,7 +137,7 @@
137137
},
138138
"nvim-tree.lua": {
139139
"branch": "master",
140-
"commit": "eb33612bff2fb31f54946fb5dcadc89e905e81ec"
140+
"commit": "037d89e60fb01a6c11a48a19540253b8c72a3c32"
141141
},
142142
"nvim-treesitter": {
143143
"branch": "master",
@@ -149,7 +149,7 @@
149149
},
150150
"nvim-web-devicons": {
151151
"branch": "master",
152-
"commit": "803353450c374192393f5387b6a0176d0972b848"
152+
"commit": "746ffbb17975ebd6c40142362eee1b0249969c5c"
153153
},
154154
"plenary.nvim": {
155155
"branch": "master",

pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"beartype>=0.22.9",
1212
"bidict>=0.23.1",
1313
"bs4>=0.0.2",
14-
"cachetools>=7.0.0",
14+
"cachetools>=7.0.1",
1515
"cvxpy>=1.8.1",
1616
"dacite>=1.9.2",
17-
"dycw-utilities[test]>=0.188.26",
17+
"dycw-utilities[test]>=0.188.30",
1818
"frozendict>=2.4.7",
1919
"holoviews>=1.22.1",
2020
"humanize>=4.15.0",
@@ -33,7 +33,7 @@
3333
"pqdm>=0.2.0",
3434
"pydantic>=2.12.5",
3535
"pyright>=1.1.408",
36-
"redis>=7.1.0",
36+
"redis>=7.1.1",
3737
"requests>=2.32.5",
3838
"rich>=14.3.2",
3939
"scikit-learn>=1.8.0",
@@ -52,18 +52,18 @@
5252

5353
[project]
5454
authors = [{ email = "d.wan@icloud.com", name = "Derek Wan" }]
55-
dependencies = ["click>=8.3.1", "dycw-utilities>=0.188.26", "libcst>=1.8.6"]
55+
dependencies = ["click>=8.3.1", "dycw-utilities>=0.188.30", "libcst>=1.8.6"]
5656
description = "Dotfiles"
5757
name = "dycw-dotfiles"
5858
readme = "README.md"
5959
requires-python = ">= 3.12"
60-
version = "0.4.20"
60+
version = "0.4.21"
6161

6262
[project.scripts]
6363
dotfiles-cli = "dotfiles._cli:cli"
6464

6565
[project.optional-dependencies]
66-
cli = ["click==8.3.1", "dycw-utilities==0.188.26", "libcst==1.8.6"]
66+
cli = ["click==8.3.1", "dycw-utilities==0.188.30", "libcst==1.8.6"]
6767

6868

6969
[tool]

src/dotfiles/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from __future__ import annotations
22

3-
__version__ = "0.4.20"
3+
__version__ = "0.4.21"

0 commit comments

Comments
 (0)