From fcaac8ca43816e7e64da792523f9bfb8291767fc Mon Sep 17 00:00:00 2001 From: Ethan Paul <24588726+enpaul@users.noreply.github.com> Date: Wed, 29 Mar 2023 18:57:10 -0400 Subject: [PATCH] Add workaround for export plugin issue --- poetry.lock | 171 ++++++++++++++++++++++++++++++------------------- pyproject.toml | 9 +-- tox.ini | 13 ++-- 3 files changed, 118 insertions(+), 75 deletions(-) diff --git a/poetry.lock b/poetry.lock index cd31d52..b847f9d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -96,21 +96,22 @@ files = [ [[package]] name = "attrs" -version = "20.3.0" +version = "22.2.0" description = "Classes Without Boilerplate" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" files = [ - {file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"}, - {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"}, + {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"}, + {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"}, ] [package.extras] -dev = ["coverage[toml] (>=5.0.2)", "furo", "hypothesis", "pre-commit", "pympler", "pytest (>=4.3.0)", "six", "sphinx", "zope.interface"] -docs = ["furo", "sphinx", "zope.interface"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] -tests-no-zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] +cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"] +dev = ["attrs[docs,tests]"] +docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope.interface"] +tests = ["attrs[tests-no-zope]", "zope.interface"] +tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", "mypy (>=0.971,<0.990)", "mypy (>=0.971,<0.990)", "pympler", "pympler", "pytest (>=4.3.0)", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-mypy-plugins", "pytest-xdist[psutil]", "pytest-xdist[psutil]"] [[package]] name = "backcall" @@ -498,21 +499,6 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -[[package]] -name = "commonmark" -version = "0.9.1" -description = "Python parser for the CommonMark Markdown spec" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"}, - {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"}, -] - -[package.extras] -test = ["flake8 (==3.7.8)", "hypothesis (==3.55.3)"] - [[package]] name = "coverage" version = "6.2" @@ -1136,6 +1122,27 @@ files = [ {file = "lazy_object_proxy-1.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:db1c1722726f47e10e0b5fdbf15ac3b8adb58c091d12b3ab713965795036985f"}, ] +[[package]] +name = "linkify-it-py" +version = "2.0.0" +description = "Links recognition library with FULL unicode support." +category = "dev" +optional = false +python-versions = ">=3.6" +files = [ + {file = "linkify-it-py-2.0.0.tar.gz", hash = "sha256:476464480906bed8b2fa3813bf55566282e55214ad7e41b7d1c2b564666caf2f"}, + {file = "linkify_it_py-2.0.0-py3-none-any.whl", hash = "sha256:1bff43823e24e507a099e328fc54696124423dd6320c75a9da45b4b754b748ad"}, +] + +[package.dependencies] +uc-micro-py = "*" + +[package.extras] +benchmark = ["pytest", "pytest-benchmark"] +dev = ["black", "flake8", "isort", "pre-commit"] +doc = ["myst-parser", "sphinx", "sphinx-book-theme"] +test = ["coverage", "pytest", "pytest-cov"] + [[package]] name = "lockfile" version = "0.12.2" @@ -1150,26 +1157,29 @@ files = [ [[package]] name = "markdown-it-py" -version = "0.6.2" +version = "2.2.0" description = "Python port of markdown-it. Markdown parsing, done right!" category = "dev" optional = false -python-versions = "~=3.6" +python-versions = ">=3.7" files = [ - {file = "markdown-it-py-0.6.2.tar.gz", hash = "sha256:c3b9f995be0792cbbc8ab2f53d74072eb7ff8a8b622be8d61d38ab879709eca3"}, - {file = "markdown_it_py-0.6.2-py3-none-any.whl", hash = "sha256:30b3e9f8198dc82a5df0dcb73fd31d56cd9a43bf8a747feb10b2ba74f962bcb1"}, + {file = "markdown-it-py-2.2.0.tar.gz", hash = "sha256:7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1"}, + {file = "markdown_it_py-2.2.0-py3-none-any.whl", hash = "sha256:5a35f8d1870171d9acc47b99612dc146129b631baf04970128b568f190d0cc30"}, ] [package.dependencies] -attrs = ">=19,<21" -mdit-py-plugins = ">=0.2.1,<0.3.0" +linkify-it-py = {version = ">=1,<3", optional = true, markers = "extra == \"linkify\""} +mdurl = ">=0.1,<1.0" [package.extras] -code-style = ["pre-commit (==2.6)"] -compare = ["commonmark (>=0.9.1,<0.10.0)", "markdown (>=3.2.2,<3.3.0)", "mistletoe-ebp (>=0.10.0,<0.11.0)", "mistune (>=0.8.4,<0.9.0)", "panflute (>=1.12,<2.0)"] -linkify = ["linkify-it-py (>=1.0,<2.0)"] -rtd = ["myst-nb (>=0.11.1,<0.12.0)", "pyyaml", "sphinx (>=2,<4)", "sphinx-book-theme", "sphinx-copybutton", "sphinx-panels (>=0.4.0,<0.5.0)"] -testing = ["coverage", "psutil", "pytest (>=3.6,<4)", "pytest-benchmark (>=3.2,<4.0)", "pytest-cov", "pytest-regressions"] +benchmarking = ["psutil", "pytest", "pytest-benchmark"] +code-style = ["pre-commit (>=3.0,<4.0)"] +compare = ["commonmark (>=0.9,<1.0)", "markdown (>=3.4,<4.0)", "mistletoe (>=1.0,<2.0)", "mistune (>=2.0,<3.0)", "panflute (>=2.3,<3.0)"] +linkify = ["linkify-it-py (>=1,<3)"] +plugins = ["mdit-py-plugins"] +profiling = ["gprof2dot"] +rtd = ["attrs", "myst-parser", "pyyaml", "sphinx", "sphinx-copybutton", "sphinx-design", "sphinx_book_theme"] +testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] [[package]] name = "markupsafe" @@ -1279,73 +1289,87 @@ files = [ [[package]] name = "mdformat" -version = "0.6.4" +version = "0.7.16" description = "CommonMark compliant Markdown formatter" category = "dev" optional = false -python-versions = ">=3.6.1,<4.0.0" +python-versions = ">=3.7" files = [ - {file = "mdformat-0.6.4-py3-none-any.whl", hash = "sha256:857b5030bb7732eed181a957ac78c0667138f105d11103e55f723221e9131ad4"}, - {file = "mdformat-0.6.4.tar.gz", hash = "sha256:4f89cd5c6e43e664552bbc1e826bb5c42a13d0ce21e4e1c6415b5b1d1ac7fbd8"}, + {file = "mdformat-0.7.16-py3-none-any.whl", hash = "sha256:76398d03baa394f331fb560fd0aed8257cf77b65b1c8146b92d395af16253662"}, + {file = "mdformat-0.7.16.tar.gz", hash = "sha256:99b105033207d2ab70ba1ced8e07327ed4ef1e0a6bc1c7c00207ea73ab502782"}, ] [package.dependencies] -markdown-it-py = ">=0.5.5,<0.7.0" +markdown-it-py = ">=1.0.0,<3.0.0" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} [[package]] name = "mdformat-gfm" -version = "0.2.0" +version = "0.3.5" description = "Mdformat plugin for GitHub Flavored Markdown compatibility" category = "dev" optional = false -python-versions = ">=3.6.1,<4.0.0" +python-versions = ">=3.7,<4.0" files = [ - {file = "mdformat-gfm-0.2.0.tar.gz", hash = "sha256:0242ff945968454f4c97a531ebc80fa164c4459385c75b5e9614f96c72a1d8df"}, - {file = "mdformat_gfm-0.2.0-py3-none-any.whl", hash = "sha256:b6f1381389f056170be438dc3192a5406b6a2efe5ba0886edb7a297ce4d2e2f0"}, + {file = "mdformat-gfm-0.3.5.tar.gz", hash = "sha256:5ee5f0de1d3b56d5edfced023bfff0aeed958be328e5460dac3221ac1b61ce7c"}, + {file = "mdformat_gfm-0.3.5-py3-none-any.whl", hash = "sha256:1e627edc7665b59e008b3b9e5decc18c40cbd625c196d77e5ea3bc624e80ac8a"}, ] [package.dependencies] -markdown-it-py = ">=0.5.8" -mdformat = ">=0.6.0,<0.7.0" -mdformat-tables = ">=0.3.0" -mdit-py-plugins = ">=0.2.0" +markdown-it-py = {version = "*", extras = ["linkify"]} +mdformat = ">=0.7.5,<0.8.0" +mdformat-tables = ">=0.4.0" +mdit-py-plugins = ">=0.2.0,<0.4.0" [[package]] name = "mdformat-tables" -version = "0.3.0" +version = "0.4.1" description = "An mdformat plugin for rendering tables." category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" files = [ - {file = "mdformat_tables-0.3.0-py3-none-any.whl", hash = "sha256:cce24ca56a2a860f15475084b159bf71330480cb64afcf75a0f7411d62aeeaa9"}, - {file = "mdformat_tables-0.3.0.tar.gz", hash = "sha256:312feb8f0ac01f1d672c34fa22efb89469e11f9ba4849fbba8866a241eb0d442"}, + {file = "mdformat_tables-0.4.1-py3-none-any.whl", hash = "sha256:981f3dc7350027f78e3fd6a5fe8a16e123eec423af2d140e588d855751501019"}, + {file = "mdformat_tables-0.4.1.tar.gz", hash = "sha256:3024e88e9d29d7b8bb07fd6b59c9d5dcf14d2060122be29e30e72d27b65d7da9"}, ] [package.dependencies] -mdformat = ">=0.6.0,<0.7.0" +mdformat = ">=0.7.5,<0.8.0" [package.extras] test = ["coverage", "pytest (>=6.0,<7.0)", "pytest-cov"] [[package]] name = "mdit-py-plugins" -version = "0.2.6" +version = "0.3.5" description = "Collection of plugins for markdown-it-py" category = "dev" optional = false -python-versions = "~=3.6" +python-versions = ">=3.7" files = [ - {file = "mdit-py-plugins-0.2.6.tar.gz", hash = "sha256:1e467ca2ea056e8065cbd5d6c61e5052bb50826bde84c40f6a5ed77e82125710"}, - {file = "mdit_py_plugins-0.2.6-py3-none-any.whl", hash = "sha256:77fd75dad81109ee91f30eb49146196f79afbbae041f298ae4886c8c2b5e23d7"}, + {file = "mdit-py-plugins-0.3.5.tar.gz", hash = "sha256:eee0adc7195e5827e17e02d2a258a2ba159944a0748f59c5099a4a27f78fcf6a"}, + {file = "mdit_py_plugins-0.3.5-py3-none-any.whl", hash = "sha256:ca9a0714ea59a24b2b044a1831f48d817dd0c817e84339f20e7889f392d77c4e"}, ] [package.dependencies] -markdown-it-py = ">=0.5.8,<2.0.0" +markdown-it-py = ">=1.0.0,<3.0.0" [package.extras] -code-style = ["pre-commit (==2.6)"] -testing = ["coverage", "pytest (>=3.6,<4)", "pytest-cov", "pytest-regressions"] +code-style = ["pre-commit"] +rtd = ["attrs", "myst-parser (>=0.16.1,<0.17.0)", "sphinx-book-theme (>=0.1.0,<0.2.0)"] +testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] + +[[package]] +name = "mdurl" +version = "0.1.2" +description = "Markdown URL utilities" +category = "dev" +optional = false +python-versions = ">=3.7" +files = [ + {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, + {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, +] [[package]] name = "more-itertools" @@ -2186,22 +2210,22 @@ test = ["commentjson", "packaging", "pytest"] [[package]] name = "rich" -version = "13.1.0" +version = "13.3.3" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" category = "dev" optional = false python-versions = ">=3.7.0" files = [ - {file = "rich-13.1.0-py3-none-any.whl", hash = "sha256:f846bff22a43e8508aebf3f0f2410ce1c6f4cde429098bd58d91fde038c57299"}, - {file = "rich-13.1.0.tar.gz", hash = "sha256:81c73a30b144bbcdedc13f4ea0b6ffd7fdc3b0d3cc259a9402309c8e4aee1964"}, + {file = "rich-13.3.3-py3-none-any.whl", hash = "sha256:540c7d6d26a1178e8e8b37e9ba44573a3cd1464ff6348b99ee7061b95d1c6333"}, + {file = "rich-13.3.3.tar.gz", hash = "sha256:dc84400a9d842b3a9c5ff74addd8eb798d155f36c1c91303888e0a66850d2a15"}, ] [package.dependencies] -commonmark = ">=0.9.0,<0.10.0" -pygments = ">=2.6.0,<3.0.0" +markdown-it-py = ">=2.2.0,<3.0.0" +pygments = ">=2.13.0,<3.0.0" [package.extras] -jupyter = ["ipywidgets (>=7.5.1,<8.0.0)"] +jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] name = "ruamel-yaml" @@ -2532,6 +2556,21 @@ files = [ {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"}, ] +[[package]] +name = "uc-micro-py" +version = "1.0.1" +description = "Micro subset of unicode data files for linkify-it-py projects." +category = "dev" +optional = false +python-versions = ">=3.6" +files = [ + {file = "uc-micro-py-1.0.1.tar.gz", hash = "sha256:b7cdf4ea79433043ddfe2c82210208f26f7962c0cfbe3bacb05ee879a7fdb596"}, + {file = "uc_micro_py-1.0.1-py3-none-any.whl", hash = "sha256:316cfb8b6862a0f1d03540f0ae6e7b033ff1fa0ddbe60c12cbe0d4cec846a69f"}, +] + +[package.extras] +test = ["coverage", "pytest", "pytest-cov"] + [[package]] name = "urllib3" version = "1.26.15" @@ -2787,4 +2826,4 @@ ansible = ["ansible-core"] [metadata] lock-version = "2.0" python-versions = "^3.6.1" -content-hash = "52d2e58443bf0e36f8b66e9575b21cf69f7c6beccbd4948400acff36a38721c7" +content-hash = "e115a6784f2e0855e740a4281df92e406d4cca0abbc7699b051f1bd77a0229f1" diff --git a/pyproject.toml b/pyproject.toml index ea6913b..783c389 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,15 +46,16 @@ ansible-core = {version = "^2.11.5", optional = true} black = {version = "^23.1.0", python = "^3.10"} blacken-docs = {version = "^1.13.0", python = "^3.10"} ipython = {version = "^8.10.1", python = "^3.10"} -packaging = {version = "^23.0", python = "^3.10"} # Implicit python compat check fails for some reason +mdformat = {version = "^0.7.16", python = "^3.10"} +mdformat-gfm = {version = "^0.3.5", python = "^3.10"} +mypy = {version = "^1.1.1", python = "^3.10"} pre-commit = {version = "^2.7.1", python = "^3.10"} pre-commit-hooks = {version = "^3.3.0", python = "^3.10"} pylint = {version = "^2.4.4", python = "^3.10"} reorder-python-imports = {version = "^2.3.5", python = "^3.10"} types-toml = {version = "^0.10.4", python = "^3.10"} -mypy = {version = "^1.0.1", python = "^3.10"} -mdformat = {version = "^0.6.4", python = "^3.10"} -mdformat-gfm = {version = "^0.2", python = "^3.10"} +# Implicit python version check fails for this one +packaging = {version = "^23.0", python = "^3.10"} [tool.poetry.group.security.dependencies] bandit = {version = "^1.6.2", python = "^3.10"} diff --git a/tox.ini b/tox.ini index c1a2e31..f2da564 100644 --- a/tox.ini +++ b/tox.ini @@ -69,11 +69,14 @@ commands = poetry export \ --format requirements.txt \ --output {envtmpdir}/requirements.txt \ - --without-hashes \ - --with dev \ - --with ci \ - --with security \ - --with test + --without-hashes +# For now these groups are disabled until this bug is resolved +# in poetry-plugin-export: +# https://github.com/python-poetry/poetry-plugin-export/issues/176 +# --with dev \ +# --with ci \ +# --with security \ +# --with test safety check \ --file {envtmpdir}/requirements.txt \ --json