From 12e239d861cb0b0a46f1f3d4a72c424de69266cd Mon Sep 17 00:00:00 2001 From: Derek Wan Date: Wed, 14 Aug 2024 22:47:53 +0900 Subject: [PATCH] More updates (#187) * more * do not formal xml * more * more * more --- .bumpversion.cfg | 2 +- .pre-commit-config.yaml | 6 +++++- install-mac.conf.yaml | 11 ++++++----- ipython/startup.py | 2 ++ jupyter/docmanager/plugin.jsonc | 11 ++++------- .../jupyterlab_code_formatter/settings.jsonc | 2 +- nvim/lua/snippets.lua | 9 +++++++++ redis/com.redis-stack.redis-stack-server.plist | 16 ++++++++++++++++ shell/env.sh | 18 +++++++++--------- 9 files changed, 53 insertions(+), 24 deletions(-) create mode 100644 redis/com.redis-stack.redis-stack-server.plist diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a6da845..0b6775d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,2 +1,2 @@ [bumpversion] -current_version = 0.1.184 +current_version = 0.1.185 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 839ec81..e544370 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.5.6 + rev: v0.5.7 hooks: - id: ruff args: [--fix] @@ -22,6 +22,10 @@ repos: hooks: - id: pretty-format-toml args: [--autofix, --trailing-commas] + - repo: https://github.com/pamoller/xmlformatter + rev: v0.2.6 + hooks: + - id: xml-formatter - repo: https://github.com/pre-commit/mirrors-prettier rev: v4.0.0-alpha.8 hooks: diff --git a/install-mac.conf.yaml b/install-mac.conf.yaml index be63e4b..f92606d 100644 --- a/install-mac.conf.yaml +++ b/install-mac.conf.yaml @@ -52,6 +52,7 @@ ~/.zimrc: zsh/zimrc ~/.zshenv: zsh/zshenv ~/.zshrc: zsh/zshrc + ~/Library/LaunchAgents/com.redis-stack.redis-stack-server.plist: redis/com.redis-stack.redis-stack-server.plist - shell: - [ @@ -157,11 +158,7 @@ Installing pyright, ] - [ - "command -v redis-server >/dev/null 2>&1 || brew install redis", - Installing redis, - ] - - [ - "command -v redis-stack-server >/dev/null 2>&1 || brew tap-redis-stack/redis-stack && brew install redis-stack-server", + "command -v redis-stack-server >/dev/null 2>&1 || brew tap redis-stack/redis-stack && brew install redis-stack", Installing redis-stack, ] - [ @@ -242,3 +239,7 @@ "command -v justpath >/dev/null 2>&1 || pipx install justpath", Installing justpath, ] + - [ + "launchctl load ~/Library/LaunchAgents/com.redis-stack.redis-stack-server.plist", + Launching redis-stack-server, + ] diff --git a/ipython/startup.py b/ipython/startup.py index 1c4c750..c3f2418 100644 --- a/ipython/startup.py +++ b/ipython/startup.py @@ -816,6 +816,7 @@ concat, date_range, datetime_range, + from_epoch, int_range, int_ranges, lit, @@ -915,6 +916,7 @@ concat, date_range, datetime_range, + from_epoch, int_range, int_ranges, lit, diff --git a/jupyter/docmanager/plugin.jsonc b/jupyter/docmanager/plugin.jsonc index 70c123a..2916deb 100644 --- a/jupyter/docmanager/plugin.jsonc +++ b/jupyter/docmanager/plugin.jsonc @@ -1,9 +1,6 @@ { - "autosave": true, - "autosaveInterval": 60, - "confirmClosingDocument": false, - "defaultViewers": {}, - "lastModifiedCheckMargin": 500, - "renameUntitledFileOnSave": true, - "maxNumberRecents": 10, + // Document Manager + // @jupyterlab/docmanager-extension:plugin + // Document Manager settings. + // *************************************** } diff --git a/jupyter/jupyterlab_code_formatter/settings.jsonc b/jupyter/jupyterlab_code_formatter/settings.jsonc index b39a38f..274a6e1 100644 --- a/jupyter/jupyterlab_code_formatter/settings.jsonc +++ b/jupyter/jupyterlab_code_formatter/settings.jsonc @@ -39,7 +39,7 @@ "args": ["--select=I001"], }, "ruffformat": { - "args": [], + "args": ["--line-length=80"], }, "suppressFormatterErrors": false, "suppressFormatterErrorsIFFAutoFormatOnSave": false, diff --git a/nvim/lua/snippets.lua b/nvim/lua/snippets.lua index a2aed7e..9588072 100644 --- a/nvim/lua/snippets.lua +++ b/nvim/lua/snippets.lua @@ -85,6 +85,7 @@ ls.add_snippets("python", { s("hy-invalid-argument", { t({ "from hypothesis.errors import InvalidArgument", "" }) }), s("hy-lists", { t({ "from hypothesis.strategies import lists", "" }) }), s("hy-reproduce-failure", { t({ "from hypothesis import reproduce_failure", "" }) }), + s("hy-sampled-from", { t({ "from hypothesis.strategies import sampled_from", "" }) }), s("hy-settings", { t({ "from hypothesis import settings", "" }) }), s("settings-max-examples", { t({ "@settings(max_examples=1)", "" }) }), s("settings-generate-only", { t({ "@settings(phases={Phase.generate})", "" }) }), @@ -98,6 +99,10 @@ ls.add_snippets("python", { -- loguru s("lo-logger", { t({ "from loguru import logger", "" }) }), + -- math + s("ma-inf", { t({ "from math import inf", "" }) }), + s("ma-nan", { t({ "from math import nan", "" }) }), + -- more-itertools s("mi-iterate", { t({ "from more_itertools import iterate", "" }) }), s("mi-partition", { t({ "from more_itertools import partition", "" }) }), @@ -126,6 +131,7 @@ ls.add_snippets("python", { s("po-enum", { t({ "from polars import Enum", "" }) }), s("po-expr", { t({ "from polars import Expr", "" }) }), s("po-float64", { t({ "from polars import Float64", "" }) }), + s("po-from-epoch", { t({ "from polars import from_epoch", "" }) }), s("po-int-range", { t({ "from polars import int_range", "" }) }), s("po-int-ranges", { t({ "from polars import int_ranges", "" }) }), s("po-int64", { t({ "from polars import Int64", "" }) }), @@ -211,6 +217,9 @@ ls.add_snippets("python", { -- typing-extensions s("ty-override", { t({ "from typing_extensions import override", "" }) }), + -- uuid + s("uu-uuid", { t({ "from uuid import UUID", "" }) }), + -- utilities s("ut-always-iterable", { t({ "from utilities.more_itertools import always_iterable", "" }) }), s("ut-check-polars-dataframe", { t({ "from utilities.polars import check_polars_dataframe", "" }) }), diff --git a/redis/com.redis-stack.redis-stack-server.plist b/redis/com.redis-stack.redis-stack-server.plist new file mode 100644 index 0000000..6921a48 --- /dev/null +++ b/redis/com.redis-stack.redis-stack-server.plist @@ -0,0 +1,16 @@ + + + + + Label + com.redis-stack.redis-stack-server + ProgramArguments + + /opt/homebrew/Caskroom/redis-stack-server/7.4.0-v0/bin/redis-stack-server + + RunAtLoad + + KeepAlive + + + diff --git a/shell/env.sh b/shell/env.sh index cb1a3cb..34f9d9f 100644 --- a/shell/env.sh +++ b/shell/env.sh @@ -78,15 +78,15 @@ if command -v pyenv >/dev/null 2>&1; then fi # redis-stack -if command -v brew >/dev/null 2>&1; then - __dir="$(brew --prefix)"/Caskroom/redis-stack-server/7.4.0-v0/bin - case ":${PATH}:" in - *:"${__dir}":*) ;; - *) - export PATH="${__dir}:${PATH}" - ;; - esac -fi +# if command -v brew >/dev/null 2>&1; then +# __dir="$(brew --prefix)"/Caskroom/redis-stack-server/7.4.0-v0/bin +# case ":${PATH}:" in +# *:"${__dir}":*) ;; +# *) +# export PATH="${__dir}:${PATH}" +# ;; +# esac +# fi # ripgrep export RIPGREP_CONFIG_PATH="${XDG_CONFIG_HOME:-${HOME}/.config}/ripgreprc"