From 49907173b2eb4ec09df6df94a1bc43b6f3490503 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 2 Aug 2021 20:15:51 -0700 Subject: [PATCH] mypy: Add types-Pygments. Signed-off-by: Anders Kaseorg --- pyproject.toml | 1 - requirements/dev.txt | 8 ++++++++ requirements/mypy.in | 1 + requirements/mypy.txt | 8 ++++++++ tools/lib/provision_inner.py | 4 +++- version.py | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6dff8e2afd..cc8fd9ca9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -86,7 +86,6 @@ module = [ "PIL.*", "premailer.*", "psycopg2.*", - "pygments.*", "pyinotify.*", "pyoembed.*", "pyuca.*", diff --git a/requirements/dev.txt b/requirements/dev.txt index 6b64fda0ce..0e1add517c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1660,6 +1660,10 @@ types-decorator==0.1.5 \ --hash=sha256:76045ca8ccb4cf2a2ccbaa36d02a75f4ec07af334036771af0a0b0ea0503d4a9 \ --hash=sha256:88c8f0f4229124f7bea7cbd968dea48aebbfb0144f0b50c0ec810fe18916cf65 # via -r requirements/mypy.in +types-docutils==0.1.7 \ + --hash=sha256:241b901395b4da05de39fe4aa364acc55536029e51308e11673f51e74e861645 \ + --hash=sha256:61f1e12f3b090c28979338830f122d5bfc1a2287156a8c384b6142ce6d0aa8ec + # via types-pygments types-markdown==3.3.0 \ --hash=sha256:b7bf9ce52a9f712c6a59b75350ed435d6fc1f1d5eafed44a321472bf96cf77db \ --hash=sha256:cc18cc0fcc2ba8ab3f5233b2945db33e2e68ddad179708b2d2f08da08d33bc4e @@ -1672,6 +1676,10 @@ types-polib==0.1.3 \ --hash=sha256:54fb4d5a9edc2b2f7e3cd7ebbf8631dbcecdeb69e9e31597e81c2b5b3bd3613b \ --hash=sha256:bd79bc1780e5d7fb6fd0dce59bb8d118ca81f8b2f14d5d05e21d2716e2e1937b # via -r requirements/mypy.in +types-pygments==2.9.0 \ + --hash=sha256:04dd3054e579d739e61c48757962969285ebdd09aca1bdac7c6d210455fb8f98 \ + --hash=sha256:4dc3c9b1e96bce89b30b32503d9976b2a66dbcf0d285aabc59ffd7302dbf199f + # via -r requirements/mypy.in types-python-dateutil==0.1.4 \ --hash=sha256:39bfe0bde61fc673b8fa28167bd78622d976210f791971b9f3e10877cbf119a4 \ --hash=sha256:e6486ca27b6dde73e0ec079a9e1b03e208766e6bc7f1e08964a7e9104a5c7d7a diff --git a/requirements/mypy.in b/requirements/mypy.in index 0ea329645e..2069e17380 100644 --- a/requirements/mypy.in +++ b/requirements/mypy.in @@ -13,6 +13,7 @@ types-decorator types-Markdown types-orjson types-polib +types-Pygments types-python-dateutil types-pytz types-PyYAML diff --git a/requirements/mypy.txt b/requirements/mypy.txt index bc9b0d092b..0d9630e29e 100644 --- a/requirements/mypy.txt +++ b/requirements/mypy.txt @@ -101,6 +101,10 @@ types-decorator==0.1.5 \ --hash=sha256:76045ca8ccb4cf2a2ccbaa36d02a75f4ec07af334036771af0a0b0ea0503d4a9 \ --hash=sha256:88c8f0f4229124f7bea7cbd968dea48aebbfb0144f0b50c0ec810fe18916cf65 # via -r requirements/mypy.in +types-docutils==0.1.7 \ + --hash=sha256:241b901395b4da05de39fe4aa364acc55536029e51308e11673f51e74e861645 \ + --hash=sha256:61f1e12f3b090c28979338830f122d5bfc1a2287156a8c384b6142ce6d0aa8ec + # via types-pygments types-markdown==3.3.0 \ --hash=sha256:b7bf9ce52a9f712c6a59b75350ed435d6fc1f1d5eafed44a321472bf96cf77db \ --hash=sha256:cc18cc0fcc2ba8ab3f5233b2945db33e2e68ddad179708b2d2f08da08d33bc4e @@ -113,6 +117,10 @@ types-polib==0.1.3 \ --hash=sha256:54fb4d5a9edc2b2f7e3cd7ebbf8631dbcecdeb69e9e31597e81c2b5b3bd3613b \ --hash=sha256:bd79bc1780e5d7fb6fd0dce59bb8d118ca81f8b2f14d5d05e21d2716e2e1937b # via -r requirements/mypy.in +types-pygments==2.9.0 \ + --hash=sha256:04dd3054e579d739e61c48757962969285ebdd09aca1bdac7c6d210455fb8f98 \ + --hash=sha256:4dc3c9b1e96bce89b30b32503d9976b2a66dbcf0d285aabc59ffd7302dbf199f + # via -r requirements/mypy.in types-python-dateutil==0.1.4 \ --hash=sha256:39bfe0bde61fc673b8fa28167bd78622d976210f791971b9f3e10877cbf119a4 \ --hash=sha256:e6486ca27b6dde73e0ec079a9e1b03e208766e6bc7f1e08964a7e9104a5c7d7a diff --git a/tools/lib/provision_inner.py b/tools/lib/provision_inner.py index 5ff8f2bf5b..9a87c434cc 100755 --- a/tools/lib/provision_inner.py +++ b/tools/lib/provision_inner.py @@ -9,7 +9,7 @@ from typing import List ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.append(ZULIP_PATH) -from pygments import __version__ as pygments_version +import pygments from pytz import VERSION as timezones_version from scripts.lib import clean_unused_caches @@ -24,6 +24,8 @@ from scripts.lib.zulip_tools import ( from tools.setup.generate_zulip_bots_static_files import generate_zulip_bots_static_files from version import PROVISION_VERSION +pygments_version = pygments.__version__ # type: ignore[attr-defined] # private member missing from stubs + VENV_PATH = "/srv/zulip-py3-venv" UUID_VAR_PATH = get_dev_uuid_var_path() diff --git a/version.py b/version.py index e7694377bd..5a25fd3f13 100644 --- a/version.py +++ b/version.py @@ -48,4 +48,4 @@ API_FEATURE_LEVEL = 89 # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = "153.5" +PROVISION_VERSION = "153.6"