Skip to content

Commit 488e4d2

Browse files
committed
add automerge
1 parent d44831c commit 488e4d2

File tree

5 files changed

+54
-39
lines changed

5 files changed

+54
-39
lines changed

.env.example

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ IPYTHON_CACHE_DIR='__CWD__/var/cache/ipython'
4141
MYPY_CACHE_DIR='__CWD__/var/cache/mypy'
4242
PRE_COMMIT_HOME='__CWD__/var/cache/pre-commit'
4343
PYLINTHOME='__CWD__/var/cache/pylint'
44-
RUFF_CACHE_DIR='__CWD__/var/cache/ruff'
44+
RUFF_CACHE_DIR='__CWD__/var/cache/ruff' # use python -m ruff
4545

4646
# debugging
4747
# used by python-interpreter, cfr. https://docs.python.org/3/using/cmdline.html#environment-variables
@@ -61,6 +61,7 @@ TEMP='__CWD__/var/tmp'
6161
# Supported values for logging, from lowest to highest priority:
6262
# LOGLEVEL_XXX: NOTSET|TRACE|DEBUG|INFO|WARNING|ERROR
6363
LOGGING_YML_FILE='__CWD__/etc/logging.yaml'
64+
PYTHON_LOG_CONFIG='__CWD__/etc/logging.yaml' # to be removed in v1.4s
6465
LOG_DIR='__CWD__/var/log'
6566
PYTHON_CONSOLE_FORMATTER='console_color'
6667
LOGLEVEL_ROOT='NOTSET'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# see https://github.com/ahmadnassri/action-dependabot-auto-merge
2+
name: Auto Merge Dependabot
3+
4+
on:
5+
pull_request:
6+
7+
jobs:
8+
auto-merge:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: ahmadnassri/action-dependabot-auto-merge@v2
13+
with:
14+
target: minor
15+
github-token: ${{ secrets.GITHUB_TOKEN }}

etc/ipython/profile_default/startup/10-logging.py

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
log = logging.getLogger("ipython-startup") # name = "__main__"
3131

32+
# import pdb;pdb.set_trace()
3233
log.debug("debug-message")
3334
log.info("info-message")
3435
log.warning("warning-message")

etc/logging.yaml

+36-36
Original file line numberDiff line numberDiff line change
@@ -89,29 +89,29 @@ formatters:
8989
ERROR: red
9090
CRITICAL: purple
9191

92-
console_http: # suited for black background
93-
"()": "demo_flask.formatter.HttpFormatter"
94-
datefmt: "%Y/%m/%d %H:%M:%S"
95-
format: "{asctime} - {name} - {levelname:<7} - {message}"
96-
style: "{"
97-
98-
console_color_http: # suited for black background
99-
"()": "demo_flask.formatter.ColorHttpFormatter"
100-
datefmt: "%Y/%m/%d %H:%M:%S"
101-
format: "{log_color}{asctime} - {name} - {levelname:<7} - {message}{reset}"
102-
reset: True
103-
style: "{"
104-
log_colors:
105-
# cfr. https://github.com/borntyping/python-colorlog
106-
# supported colors: blue|cyan|green|yellow|red|purple|white|black
107-
# supported prefixes: "bold_" and "bg_"
108-
# <LOGLEVEL>: <foreground-color>,<background-color>
109-
# comma is the separator, but no extra spaces allowed
110-
DEBUG: bold_cyan # bold_cyan,bg_white
111-
INFO: bold_green
112-
WARNING: yellow
113-
ERROR: red
114-
CRITICAL: purple
92+
# console_http: # suited for black background
93+
# "()": "demo_flask.formatter.HttpFormatter"
94+
# datefmt: "%Y/%m/%d %H:%M:%S"
95+
# format: "{asctime} - {name} - {levelname:<7} - {message}"
96+
# style: "{"
97+
98+
# console_color_http: # suited for black background
99+
# "()": "demo_flask.formatter.ColorHttpFormatter"
100+
# datefmt: "%Y/%m/%d %H:%M:%S"
101+
# format: "{log_color}{asctime} - {name} - {levelname:<7} - {message}{reset}"
102+
# reset: True
103+
# style: "{"
104+
# log_colors:
105+
# # cfr. https://github.com/borntyping/python-colorlog
106+
# # supported colors: blue|cyan|green|yellow|red|purple|white|black
107+
# # supported prefixes: "bold_" and "bg_"
108+
# # <LOGLEVEL>: <foreground-color>,<background-color>
109+
# # comma is the separator, but no extra spaces allowed
110+
# DEBUG: bold_cyan # bold_cyan,bg_white
111+
# INFO: bold_green
112+
# WARNING: yellow
113+
# ERROR: red
114+
# CRITICAL: purple
115115

116116
uvicorn_default: # see uvicorn/config.py
117117
"()": "uvicorn.logging.DefaultFormatter"
@@ -138,15 +138,15 @@ handlers:
138138
filters:
139139
- "regex-filter"
140140

141-
console_http:
142-
class: "logging.StreamHandler"
143-
# formatter: !env PYTHON_CONSOLE_FORMATTER, console_bw
144-
# formatter: console_http
145-
formatter: console_color_http
146-
level: !env LOGLEVEL_CONSOLE, DEBUG
147-
stream: "ext://sys.stdout"
148-
filters:
149-
- "regex-filter"
141+
# console_http:
142+
# class: "logging.StreamHandler"
143+
# # formatter: !env PYTHON_CONSOLE_FORMATTER, console_bw
144+
# # formatter: console_http
145+
# formatter: console_color_http
146+
# level: !env LOGLEVEL_CONSOLE, DEBUG
147+
# stream: "ext://sys.stdout"
148+
# filters:
149+
# - "regex-filter"
150150

151151
debug_file: &default
152152
class: "logging.handlers.RotatingFileHandler"
@@ -257,10 +257,10 @@ loggers:
257257
http.client:
258258
level: !env LOGLEVEL_HTTP_CLIENT, NOTSET
259259

260-
httplogger:
261-
level: !env LOGLEVEL_HTTPLOGGER, NOTSET
262-
handlers:
263-
- console_http
260+
# httplogger:
261+
# level: !env LOGLEVEL_HTTPLOGGER, NOTSET
262+
# handlers:
263+
# # - console_http
264264

265265
ipython-startup:
266266
level: !env LOGLEVEL_IPYTHON _STARTUP, NOTSET

etc/pythonstartup.py

-2
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,3 @@
4343
del local_cache_dir
4444
del local_cache_dir_python
4545
del prefix
46-
47-
print("PYTHONSTARTUP")

0 commit comments

Comments
 (0)