summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2022-01-13 14:52:32 -0800
committerDavid Lord <davidism@gmail.com>2022-01-13 14:52:32 -0800
commitdd2c2a898498467317d89fdad8c64cb1fd9fb83c (patch)
tree653bc6f2c4335f9a0c01fda7721810e3fd00de62
parent90a9c10c30555bba4bda3acc6c8ee731eeafa5ed (diff)
parent341836f47d9ce1fcf6491b8f0445809c5c796060 (diff)
downloadmarkupsafe-dd2c2a898498467317d89fdad8c64cb1fd9fb83c.tar.gz
Merge branch '2.0.x'
-rw-r--r--.github/dependabot.yml2
-rw-r--r--.pre-commit-config.yaml1
-rw-r--r--setup.cfg8
3 files changed, 7 insertions, 4 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a268177..b0251c7 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,7 +2,7 @@ version: 2
updates:
- package-ecosystem: "pip"
directory: "/requirements"
- target-branch: "3.0.x"
+ target-branch: "2.0.x"
versioning-strategy: "lockfile-only"
schedule:
interval: "monthly"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1c75149..2e73247 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,5 @@
ci:
+ autoupdate_branch: "2.0.x"
autoupdate_schedule: monthly
repos:
- repo: https://github.com/asottile/pyupgrade
diff --git a/setup.cfg b/setup.cfg
index 3122155..a8f3c00 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,7 @@ classifiers =
[options]
packages = find:
package_dir = = src
-include_package_data = true
+include_package_data = True
python_requires = >= 3.7
[options.packages.find]
@@ -44,7 +44,7 @@ filterwarnings =
error
[coverage:run]
-branch = true
+branch = True
source =
markupsafe
tests
@@ -60,7 +60,8 @@ source =
# F = flake8 pyflakes
# W = pycodestyle warnings
# B9 = bugbear opinions
-select = B, E, F, W, B9
+# ISC = implicit str concat
+select = B, E, F, W, B9, ISC
ignore =
# slice notation whitespace, invalid
E203
@@ -76,6 +77,7 @@ max-line-length = 80
[mypy]
files = src/markupsafe
python_version = 3.7
+show_error_codes = True
disallow_subclassing_any = True
disallow_untyped_calls = True
disallow_untyped_defs = True