Increase sleep on gitea merge from 5s -> 10s

.envrc

@@ -20,3 +20,21 @@ else
 	uv venv
 fi
 uv sync --all-extras --all-groups --active --locked
+
+
+# uv
+export UV_MANAGED_PYTHON='true'
+export UV_PRERELEASE='disallow'
+export UV_PYTHON='3.12'
+export UV_RESOLUTION='highest'
+export UV_VENV_CLEAR='true'
+if ! command -v uv >/dev/null 2>&1; then
+	echo_date "ERROR: 'uv' not found" && exit 1
+fi
+activate='.venv/bin/activate'
+if [ -f $activate ]; then
+	. $activate
+else
+	uv venv
+fi
+uv sync --all-extras --all-groups --active --locked

.github/workflows/push.yaml

@@ -20,3 +20,13 @@ jobs:
       - name: Tag the latest commit
         uses: dycw/action-tag-commit@latest
         with: {}
+  publish-package:
+    environment:
+      name: pypi
+    permissions:
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build and publish the package
+        uses: dycw/action-publish-package@latest
+        with: {}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/dycw/pre-commit-hooks
-    rev: 0.14.138
+    rev: 0.15.22
     hooks:
       - id: add-hooks
         args:
@@ -24,6 +24,8 @@ repos:
         priority: 40
       - id: format-pre-commit-config
         priority: 30
+      - id: format-pytest
+        priority: 30
       - id: format-requirements
         priority: 30
       - id: replace-sequence-str
@@ -36,15 +38,16 @@ repos:
         priority: 20
       - id: setup-bump-my-version
         args:
-          - --python-package-name-internal=dotfiles
+          - --package-name=dotfiles
         priority: 20
       - id: setup-ci-pull-request
         args:
           - --repo-name=dotfiles
+          - --set-up
         priority: 20
       - id: setup-ci-push
         args:
-          - --python
+          - --package
         priority: 20
       - id: setup-coverage
         priority: 20
@@ -63,19 +66,19 @@ repos:
       - id: setup-pyproject
         args:
           - --description=Dotfiles
-          - --python-package-name-external=dycw-dotfiles
-          - --python-package-name-internal=dotfiles
+          - --name-external=dycw-dotfiles
+          - --name-internal=dotfiles
         priority: 20
       - id: setup-pyright
         priority: 20
       - id: setup-pytest
         args:
-          - --python-package-name-internal=dotfiles
+          - --package-name=dotfiles
         priority: 20
       - id: setup-readme
         args:
-          - --repo-name=dotfiles
           - --description=Dotfiles
+          - --repo-name=dotfiles
         priority: 20
       - id: setup-ruff
         priority: 20
@@ -135,13 +138,10 @@ repos:
     hooks:
       - id: taplo-format
         args:
-          - --option
-          - indent_tables=true
-          - --option
-          - indent_entries=true
-          - --option
-          - reorder_keys=true
-        priority: 40
+          - --option=indent_entries=true
+          - --option=indent_tables=true
+          - --option=reorder_keys=true
+        priority: 30
   - repo: https://github.com/johnnymorganz/stylua
     rev: v2.3.1
     hooks:

fish/git.fish

@@ -998,7 +998,7 @@ function __gitea_merge
         set i (math $i+1)
         set elapsed (math (date +%s) - $start)
         echo "'$repo/$curr_branch' is still merging... ($i, $elapsed s)"
-        sleep 5
+        sleep 10
     end
     set -l def_branch (git default-local-branch); or return $status
     set -l args

nvim/lazy-lock.json

@@ -65,7 +65,7 @@
   },
   "indent-blankline.nvim": {
     "branch": "master",
-    "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba"
+    "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03"
   },
   "iswap.nvim": {
     "branch": "master",
@@ -81,7 +81,7 @@
   },
   "leap.nvim": {
     "branch": "main",
-    "commit": "9a26da7a14c09cd84c05a4e8326890ef0f92a590"
+    "commit": "eda0138a408a5600c45e324c69fe73c9df30939c"
   },
   "lualine.nvim": {
     "branch": "master",
@@ -121,7 +121,7 @@
   },
   "nvim-lint": {
     "branch": "master",
-    "commit": "bcd1a44edbea8cd473af7e7582d3f7ffc60d8e81"
+    "commit": "486474c2ace8d78d28995074dbdbe29011bc63d0"
   },
   "nvim-lspconfig": {
     "branch": "master",
@@ -137,7 +137,7 @@
   },
   "nvim-tree.lua": {
     "branch": "master",
-    "commit": "516f95e8efec035d344114c591e56b7fb2d4c0dc"
+    "commit": "e11ce83ed9a00f065bf676ae4e6c261c766989ba"
   },
   "nvim-treesitter": {
     "branch": "master",
@@ -157,7 +157,7 @@
   },
   "rainbow-delimiters.nvim": {
     "branch": "master",
-    "commit": "d6b802552cbe7d643a3b6b31f419c248d1f1e220"
+    "commit": "e2858c43caafec291f915ef25fbed27bbe78abbd"
   },
   "rustaceanvim": {
     "branch": "master",
@@ -189,7 +189,7 @@
   },
   "telescope.nvim": {
     "branch": "master",
-    "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc"
+    "commit": "5255aa27c422de944791318024167ad5d40aad20"
   },
   "text-case.nvim": {
     "branch": "main",

pyproject.toml

@@ -14,12 +14,12 @@
     "cachetools>=7.0.1",
     "cvxpy>=1.8.1",
     "dacite>=1.9.2",
-    "dycw-utilities[test]>=0.191.1",
+    "dycw-utilities[test]>=0.191.10",
     "frozendict>=2.4.7",
     "holoviews>=1.22.1",
     "humanize>=4.15.0",
     "hvplot>=0.12.2",
-    "hypothesis>=6.151.6",
+    "hypothesis>=6.151.9",
     "ib-async>=2.1.0",
     "inflect>=7.5.0",
     "joblib>=1.5.3",
@@ -33,7 +33,7 @@
     "pqdm>=0.2.0",
     "pydantic>=2.12.5",
     "pyright>=1.1.408",
-    "redis>=7.1.1",
+    "redis>=7.2.0",
     "requests>=2.32.5",
     "rich>=14.3.2",
     "scikit-learn>=1.8.0",
@@ -52,18 +52,18 @@
 
 [project]
   authors = [{ email = "d.wan@icloud.com", name = "Derek Wan" }]
-  dependencies = ["click>=8.3.1", "dycw-utilities>=0.191.1", "libcst>=1.8.6"]
+  dependencies = ["click>=8.3.1", "dycw-utilities>=0.191.10", "libcst>=1.8.6"]
   description = "Dotfiles"
   name = "dycw-dotfiles"
   readme = "README.md"
   requires-python = ">= 3.12"
-  version = "0.4.24"
+  version = "0.4.25"
 
   [project.scripts]
     dotfiles-cli = "dotfiles._cli:cli"
 
   [project.optional-dependencies]
-    cli = ["dycw-utilities==0.191.1"]
+    cli = ["click==8.3.1", "dycw-utilities==0.191.10", "libcst==1.8.6"]
 
 
 [tool]

pytest.toml

@@ -1,13 +1,13 @@
 [pytest]
   addopts = [
-    "-ra",
-    "-vv",
     "--color=auto",
-    "--durations=10",
-    "--durations-min=10",
-    "--cov=dotfiles",
     "--cov-config=.coveragerc.toml",
     "--cov-report=html",
+    "--cov=dotfiles",
+    "--durations-min=10",
+    "--durations=10",
+    "-ra",
+    "-vv",
   ]
   asyncio_default_fixture_loop_scope = "function"
   asyncio_mode = "auto"

src/dotfiles/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.4.24"
+__version__ = "0.4.25"