summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2021-04-16 08:24:21 -0700
committerGitHub <noreply@github.com>2021-04-16 08:24:21 -0700
commitd77a91b1cba05d9dc78d4b03d312fcff3ca91ebb (patch)
treef7bc019c27d7448e5559cc333fa504a243c34cc9
parentb98182fc376548493ee0c1d70d3f962356cfeada (diff)
parent8179a3c2dad8a94c09432c1aca692c80ab82b293 (diff)
downloadjinja2-3.0.0rc1.tar.gz
Merge pull request #1399 from pallets/release-3.0.0rc13.0.0rc1
Release 3.0.0rc1
-rw-r--r--.pre-commit-config.yaml4
-rw-r--r--requirements/dev.txt24
-rw-r--r--requirements/docs.in2
-rw-r--r--requirements/docs.txt12
-rw-r--r--requirements/tests.txt4
-rw-r--r--requirements/typing.txt4
-rw-r--r--setup.py4
-rw-r--r--src/jinja2/__init__.py2
8 files changed, 28 insertions, 28 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 838e0a2..16613e8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,13 +14,13 @@ repos:
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
- rev: 3.9.0
+ rev: 3.9.1
hooks:
- id: flake8
additional_dependencies: [flake8-bugbear]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
hooks:
- - id: check-byte-order-marker
+ - id: fix-byte-order-marker
- id: trailing-whitespace
- id: end-of-file-fixer
diff --git a/requirements/dev.txt b/requirements/dev.txt
index e47b869..589384a 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile ../requirements/dev.in
+# pip-compile requirements/dev.in
#
alabaster==0.7.12
# via sphinx
@@ -43,7 +43,7 @@ markupsafe==1.1.1
mypy-extensions==0.4.3
# via mypy
mypy==0.812
- # via -r ../requirements/typing.in
+ # via -r requirements/typing.in
nodeenv==1.6.0
# via pre-commit
packaging==20.9
@@ -52,18 +52,18 @@ packaging==20.9
# pytest
# sphinx
# tox
-pallets-sphinx-themes==1.2.3
- # via -r ../requirements/docs.in
+pallets-sphinx-themes==2.0.0rc1
+ # via -r requirements/docs.in
pep517==0.10.0
# via pip-tools
-pip-tools==6.0.1
- # via -r ../requirements/dev.in
+pip-tools==6.1.0
+ # via -r requirements/dev.in
pluggy==0.13.1
# via
# pytest
# tox
pre-commit==2.12.0
- # via -r ../requirements/dev.in
+ # via -r requirements/dev.in
py==1.10.0
# via
# pytest
@@ -73,7 +73,7 @@ pygments==2.8.1
pyparsing==2.4.7
# via packaging
pytest==6.2.3
- # via -r ../requirements/tests.in
+ # via -r requirements/tests.in
pytz==2021.1
# via babel
pyyaml==5.4.1
@@ -87,10 +87,10 @@ six==1.15.0
snowballstemmer==2.1.0
# via sphinx
sphinx-issues==1.2.0
- # via -r ../requirements/docs.in
+ # via -r requirements/docs.in
sphinx==3.5.4
# via
- # -r ../requirements/docs.in
+ # -r requirements/docs.in
# pallets-sphinx-themes
# sphinx-issues
# sphinxcontrib-log-cabinet
@@ -103,7 +103,7 @@ sphinxcontrib-htmlhelp==1.0.3
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-log-cabinet==1.0.1
- # via -r ../requirements/docs.in
+ # via -r requirements/docs.in
sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.4
@@ -115,7 +115,7 @@ toml==0.10.2
# pytest
# tox
tox==3.23.0
- # via -r ../requirements/dev.in
+ # via -r requirements/dev.in
typed-ast==1.4.3
# via mypy
typing-extensions==3.7.4.3
diff --git a/requirements/docs.in b/requirements/docs.in
index 7ec501b..1862ddd 100644
--- a/requirements/docs.in
+++ b/requirements/docs.in
@@ -1,4 +1,4 @@
-Pallets-Sphinx-Themes
+Pallets-Sphinx-Themes >= 2.0.0rc1
Sphinx
sphinx-issues
sphinxcontrib-log-cabinet
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 604c175..9b58c50 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile ../requirements/docs.in
+# pip-compile requirements/docs.in
#
alabaster==0.7.12
# via sphinx
@@ -26,8 +26,8 @@ packaging==20.9
# via
# pallets-sphinx-themes
# sphinx
-pallets-sphinx-themes==1.2.3
- # via -r ../requirements/docs.in
+pallets-sphinx-themes==2.0.0rc1
+ # via -r requirements/docs.in
pygments==2.8.1
# via sphinx
pyparsing==2.4.7
@@ -39,10 +39,10 @@ requests==2.25.1
snowballstemmer==2.1.0
# via sphinx
sphinx-issues==1.2.0
- # via -r ../requirements/docs.in
+ # via -r requirements/docs.in
sphinx==3.5.4
# via
- # -r ../requirements/docs.in
+ # -r requirements/docs.in
# pallets-sphinx-themes
# sphinx-issues
# sphinxcontrib-log-cabinet
@@ -55,7 +55,7 @@ sphinxcontrib-htmlhelp==1.0.3
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-log-cabinet==1.0.1
- # via -r ../requirements/docs.in
+ # via -r requirements/docs.in
sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.4
diff --git a/requirements/tests.txt b/requirements/tests.txt
index fbf52fe..f7df2b8 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile ../requirements/tests.in
+# pip-compile requirements/tests.in
#
attrs==20.3.0
# via pytest
@@ -17,6 +17,6 @@ py==1.10.0
pyparsing==2.4.7
# via packaging
pytest==6.2.3
- # via -r ../requirements/tests.in
+ # via -r requirements/tests.in
toml==0.10.2
# via pytest
diff --git a/requirements/typing.txt b/requirements/typing.txt
index 383fc8f..29e12e5 100644
--- a/requirements/typing.txt
+++ b/requirements/typing.txt
@@ -2,12 +2,12 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile ../requirements/typing.in
+# pip-compile requirements/typing.in
#
mypy-extensions==0.4.3
# via mypy
mypy==0.812
- # via -r ../requirements/typing.in
+ # via -r requirements/typing.in
typed-ast==1.4.3
# via mypy
typing-extensions==3.7.4.3
diff --git a/setup.py b/setup.py
index 00c1f5d..007f929 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,6 @@ from setuptools import setup
# Metadata goes in setup.cfg. These are here for GitHub's dependency graph.
setup(
name="Jinja2",
- install_requires=["MarkupSafe>=1.1"],
- extras_require={"i18n": ["Babel>=2.1"]},
+ install_requires=["MarkupSafe>=2.0.0rc2"],
+ extras_require={"i18n": ["Babel>=2.7"]},
)
diff --git a/src/jinja2/__init__.py b/src/jinja2/__init__.py
index bdb49c5..2a39873 100644
--- a/src/jinja2/__init__.py
+++ b/src/jinja2/__init__.py
@@ -42,4 +42,4 @@ from .utils import pass_environment
from .utils import pass_eval_context
from .utils import select_autoescape
-__version__ = "3.0.0a1"
+__version__ = "3.0.0rc1"