From 64ae425716355d6fce7caa2327c5551473a7a463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=85?= Date: Fri, 6 Nov 2020 13:18:24 -0300 Subject: [PATCH] poetry: update pyproject and lockfile --- poetry.lock | 191 ++++++++++++++++++++++++++++++++++--------------- pyproject.toml | 14 ++-- 2 files changed, 140 insertions(+), 65 deletions(-) diff --git a/poetry.lock b/poetry.lock index 478bac27..96daf99c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -19,12 +19,20 @@ ansible = ">=2.8" pyyaml = "*" rich = "*" -[package.dependencies."ruamel.yaml"] +[[package.dependencies."ruamel.yaml"]] +python = "<3.7" +version = ">=0.15.34,<1" + +[[package.dependencies."ruamel.yaml"]] python = ">=3.7" version = ">=0.15.37,<1" +[package.dependencies.typing-extensions] +python = "<3.8" +version = "*" + [[package]] -category = "main" +category = "dev" description = "Better dates & times for Python" name = "arrow" optional = false @@ -35,7 +43,7 @@ version = "0.17.0" python-dateutil = ">=2.7.0" [[package]] -category = "main" +category = "dev" description = "Atomic file writes." marker = "sys_platform == \"win32\"" name = "atomicwrites" @@ -44,7 +52,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" version = "1.4.0" [[package]] -category = "main" +category = "dev" description = "Classes Without Boilerplate" name = "attrs" optional = false @@ -58,7 +66,7 @@ tests = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six tests_no_zope = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] [[package]] -category = "main" +category = "dev" description = "Modern password hashing for your software and your servers" name = "bcrypt" optional = false @@ -74,7 +82,7 @@ tests = ["pytest (>=3.2.1,<3.3.0 || >3.3.0)"] typecheck = ["mypy"] [[package]] -category = "main" +category = "dev" description = "Ultra-lightweight pure Python package to check if a file is binary or text." name = "binaryornot" optional = false @@ -85,7 +93,7 @@ version = "0.4.4" chardet = ">=3.0.2" [[package]] -category = "main" +category = "dev" description = "Lightweight, extensible schema and data validation tool for Python dictionaries." name = "cerberus" optional = false @@ -96,7 +104,7 @@ version = "1.3.2" setuptools = "*" [[package]] -category = "main" +category = "dev" description = "Python package for providing Mozilla's CA Bundle." name = "certifi" optional = false @@ -104,7 +112,7 @@ python-versions = "*" version = "2020.6.20" [[package]] -category = "main" +category = "dev" description = "Foreign Function Interface for Python calling C code." name = "cffi" optional = false @@ -115,7 +123,7 @@ version = "1.14.3" pycparser = "*" [[package]] -category = "main" +category = "dev" description = "Universal encoding detector for Python 2 and 3" name = "chardet" optional = false @@ -123,7 +131,7 @@ python-versions = "*" version = "3.0.4" [[package]] -category = "main" +category = "dev" description = "Composable command line interface toolkit" name = "click" optional = false @@ -131,7 +139,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" version = "7.1.2" [[package]] -category = "main" +category = "dev" description = "Fish, Bash, Zsh and PowerShell completion for Click" name = "click-completion" optional = false @@ -145,7 +153,7 @@ shellingham = "*" six = "*" [[package]] -category = "main" +category = "dev" description = "Colorization of help messages in Click" name = "click-help-colors" optional = false @@ -159,7 +167,7 @@ click = ">=7.0" dev = ["pytest"] [[package]] -category = "main" +category = "dev" description = "Cross-platform colored terminal text." name = "colorama" optional = false @@ -178,7 +186,7 @@ version = "0.9.1" test = ["flake8 (3.7.8)", "hypothesis (3.55.3)"] [[package]] -category = "main" +category = "dev" description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template." name = "cookiecutter" optional = false @@ -197,7 +205,7 @@ requests = ">=2.23.0" six = ">=1.10" [[package]] -category = "main" +category = "dev" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." name = "cryptography" optional = false @@ -216,7 +224,16 @@ ssh = ["bcrypt (>=3.1.5)"] test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] [[package]] -category = "main" +category = "dev" +description = "A backport of the dataclasses module for Python 3.6" +marker = "python_version >= \"3.6\" and python_version < \"3.7\"" +name = "dataclasses" +optional = false +python-versions = ">=3.6, <3.7" +version = "0.7" + +[[package]] +category = "dev" description = "Distro - an OS platform information API" name = "distro" optional = false @@ -224,7 +241,7 @@ python-versions = "*" version = "1.5.0" [[package]] -category = "main" +category = "dev" description = "A Python library for the Docker Engine API." name = "docker" optional = false @@ -242,7 +259,7 @@ ssh = ["paramiko (>=2.4.2)"] tls = ["pyOpenSSL (>=17.5.0)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"] [[package]] -category = "main" +category = "dev" description = "A python package that provides useful locks." name = "fasteners" optional = false @@ -266,14 +283,34 @@ mccabe = ">=0.6.0,<0.7.0" pycodestyle = ">=2.6.0a1,<2.7.0" pyflakes = ">=2.2.0,<2.3.0" +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + [[package]] -category = "main" +category = "dev" description = "Internationalized Domain Names in Applications (IDNA)" name = "idna" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" version = "2.10" +[[package]] +category = "dev" +description = "Read metadata from Python packages" +marker = "python_version < \"3.8\"" +name = "importlib-metadata" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +version = "2.0.0" + +[package.dependencies] +zipp = ">=0.5" + +[package.extras] +docs = ["sphinx", "rst.linker"] +testing = ["packaging", "pep517", "importlib-resources (>=1.3)"] + [[package]] category = "main" description = "A very fast and expressive template engine." @@ -289,7 +326,7 @@ MarkupSafe = ">=0.23" i18n = ["Babel (>=0.8)"] [[package]] -category = "main" +category = "dev" description = "Jinja2 Extension for Dates and Times" name = "jinja2-time" optional = false @@ -317,7 +354,7 @@ python-versions = "*" version = "0.6.1" [[package]] -category = "main" +category = "dev" description = "Molecule aids in the development and testing of Ansible roles" name = "molecule" optional = false @@ -356,7 +393,7 @@ test = ["ansi2html", "coverage (<5)", "mock (>=3.0.5,<4)", "packaging", "pytest- windows = ["pywinrm"] [[package]] -category = "main" +category = "dev" description = "An implementation of time.monotonic() for Python 2 & < 3.3" name = "monotonic" optional = false @@ -364,7 +401,7 @@ python-versions = "*" version = "1.5" [[package]] -category = "main" +category = "dev" description = "More routines for operating on iterables, beyond itertools" name = "more-itertools" optional = false @@ -372,7 +409,7 @@ python-versions = ">=3.5" version = "8.6.0" [[package]] -category = "main" +category = "dev" description = "Core utilities for Python packages" name = "packaging" optional = false @@ -384,7 +421,7 @@ pyparsing = ">=2.0.2" six = "*" [[package]] -category = "main" +category = "dev" description = "SSH2 protocol library" name = "paramiko" optional = false @@ -403,7 +440,7 @@ gssapi = ["pyasn1 (>=0.1.7)", "gssapi (>=1.4.1)", "pywin32 (>=2.1.8)"] invoke = ["invoke (>=1.3)"] [[package]] -category = "main" +category = "dev" description = "Utility library for gitignore style pattern matching of file paths." name = "pathspec" optional = false @@ -411,7 +448,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" version = "0.8.0" [[package]] -category = "main" +category = "dev" description = "Pexpect allows easy control of interactive console applications." name = "pexpect" optional = false @@ -422,18 +459,23 @@ version = "4.8.0" ptyprocess = ">=0.5" [[package]] -category = "main" +category = "dev" description = "plugin and hook calling mechanisms for python" name = "pluggy" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" version = "0.13.1" +[package.dependencies] +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12" + [package.extras] dev = ["pre-commit", "tox"] [[package]] -category = "main" +category = "dev" description = "A lightweight YAML Parser for Python. 🐓" name = "poyo" optional = false @@ -441,7 +483,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" version = "0.5.0" [[package]] -category = "main" +category = "dev" description = "Run a subprocess in a pseudo terminal" name = "ptyprocess" optional = false @@ -449,7 +491,7 @@ python-versions = "*" version = "0.6.0" [[package]] -category = "main" +category = "dev" description = "library with cross-python path, ini-parsing, io, code, log facilities" name = "py" optional = false @@ -465,7 +507,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" version = "2.6.0" [[package]] -category = "main" +category = "dev" description = "C parser in Python" name = "pycparser" optional = false @@ -489,7 +531,7 @@ python-versions = ">=3.5" version = "2.7.2" [[package]] -category = "main" +category = "dev" description = "Python binding to the Networking and Cryptography (NaCl) library" name = "pynacl" optional = false @@ -505,7 +547,7 @@ docs = ["sphinx (>=1.6.5)", "sphinx-rtd-theme"] tests = ["pytest (>=3.2.1,<3.3.0 || >3.3.0)", "hypothesis (>=3.27.0)"] [[package]] -category = "main" +category = "dev" description = "Python parsing module" name = "pyparsing" optional = false @@ -513,7 +555,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" version = "2.4.7" [[package]] -category = "main" +category = "dev" description = "pytest: simple powerful testing with Python" name = "pytest" optional = false @@ -530,12 +572,16 @@ pluggy = ">=0.12,<1.0" py = ">=1.5.0" wcwidth = "*" +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12" + [package.extras] checkqa-mypy = ["mypy (v0.761)"] testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] [[package]] -category = "main" +category = "dev" description = "Extensions to the standard Python datetime module" name = "python-dateutil" optional = false @@ -546,7 +592,7 @@ version = "2.8.1" six = ">=1.5" [[package]] -category = "main" +category = "dev" description = "gilt - A GIT layering tool." name = "python-gilt" optional = false @@ -564,7 +610,7 @@ sh = "*" test = ["black (19.10b0)", "flake8", "hacking", "pep517", "pytest", "pytest-cov", "pytest-helpers-namespace", "pytest-mock", "twine"] [[package]] -category = "main" +category = "dev" description = "A Python Slugify application that handles Unicode" name = "python-slugify" optional = false @@ -578,7 +624,7 @@ text-unidecode = ">=1.3" unidecode = ["Unidecode (>=1.1.1)"] [[package]] -category = "main" +category = "dev" description = "Python for Window Extensions" marker = "sys_platform == \"win32\"" name = "pywin32" @@ -587,7 +633,7 @@ python-versions = "*" version = "227" [[package]] -category = "main" +category = "dev" description = "YAML parser and emitter for Python" name = "pyyaml" optional = false @@ -595,7 +641,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" version = "5.3.1" [[package]] -category = "main" +category = "dev" description = "Python HTTP for Humans." name = "requests" optional = false @@ -626,13 +672,17 @@ commonmark = ">=0.9.0,<0.10.0" pygments = ">=2.6.0,<3.0.0" typing-extensions = ">=3.7.4,<4.0.0" +[package.dependencies.dataclasses] +python = ">=3.6,<3.7" +version = ">=0.7,<0.8" + [package.extras] jupyter = ["ipywidgets (>=7.5.1,<8.0.0)"] [[package]] category = "dev" description = "ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order" -marker = "python_version >= \"3.7\"" +marker = "python_version < \"3.7\" or python_version >= \"3.7\"" name = "ruamel.yaml" optional = false python-versions = "*" @@ -650,14 +700,14 @@ jinja2 = ["ruamel.yaml.jinja2 (>=0.2)"] [[package]] category = "dev" description = "C version of reader, parser and emitter for ruamel.yaml derived from libyaml" -marker = "platform_python_implementation == \"CPython\" and python_version < \"3.9\" and python_version >= \"3.7\"" +marker = "platform_python_implementation == \"CPython\" and python_version < \"3.7\" or platform_python_implementation == \"CPython\" and python_version < \"3.9\" and python_version >= \"3.7\"" name = "ruamel.yaml.clib" optional = false python-versions = "*" version = "0.2.2" [[package]] -category = "main" +category = "dev" description = "shim selinux module" name = "selinux" optional = false @@ -669,7 +719,7 @@ distro = ">=1.3.0" setuptools = ">=39.0" [[package]] -category = "main" +category = "dev" description = "Python subprocess replacement" name = "sh" optional = false @@ -677,7 +727,7 @@ python-versions = "*" version = "1.13.1" [[package]] -category = "main" +category = "dev" description = "Tool to Detect Surrounding Shell" name = "shellingham" optional = false @@ -685,7 +735,7 @@ python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6" version = "1.3.2" [[package]] -category = "main" +category = "dev" description = "Python 2 and 3 compatibility utilities" name = "six" optional = false @@ -693,7 +743,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" version = "1.15.0" [[package]] -category = "main" +category = "dev" description = "Pretty-print tabular data" name = "tabulate" optional = false @@ -704,7 +754,7 @@ version = "0.8.7" widechars = ["wcwidth"] [[package]] -category = "main" +category = "dev" description = "Test infrastructures" name = "testinfra" optional = false @@ -721,7 +771,7 @@ salt = ["salt"] winrm = ["pywinrm"] [[package]] -category = "main" +category = "dev" description = "The most basic Text::Unidecode port" name = "text-unidecode" optional = false @@ -729,7 +779,7 @@ python-versions = "*" version = "1.3" [[package]] -category = "main" +category = "dev" description = "" name = "tree-format" optional = false @@ -748,7 +798,7 @@ python-versions = "*" version = "3.7.4.3" [[package]] -category = "main" +category = "dev" description = "HTTP library with thread-safe connection pooling, file post, and more." name = "urllib3" optional = false @@ -761,7 +811,7 @@ secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "cer socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] [[package]] -category = "main" +category = "dev" description = "Measures the displayed width of unicode strings in a terminal" name = "wcwidth" optional = false @@ -769,7 +819,7 @@ python-versions = "*" version = "0.2.5" [[package]] -category = "main" +category = "dev" description = "WebSocket client for Python. hybi13 is supported." name = "websocket-client" optional = false @@ -780,7 +830,7 @@ version = "0.57.0" six = "*" [[package]] -category = "main" +category = "dev" description = "A linter for YAML files." name = "yamllint" optional = false @@ -792,10 +842,23 @@ pathspec = ">=0.5.3" pyyaml = "*" setuptools = "*" +[[package]] +category = "dev" +description = "Backport of pathlib-compatible object wrapper for zip files" +marker = "python_version < \"3.8\"" +name = "zipp" +optional = false +python-versions = ">=3.6" +version = "3.4.0" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] + [metadata] -content-hash = "438f2e02025d222b379d0a1b53c73cbd146aee0a6d009fb9141cba8f354519ae" +content-hash = "4114e22097faba4d352cd5aa591e462e7d681179fea8b2f46c819dede8e54aee" lock-version = "1.0" -python-versions = "^3.8" +python-versions = "^3.6" [metadata.files] ansible = [ @@ -926,6 +989,10 @@ cryptography = [ {file = "cryptography-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851"}, {file = "cryptography-3.2.1.tar.gz", hash = "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3"}, ] +dataclasses = [ + {file = "dataclasses-0.7-py3-none-any.whl", hash = "sha256:3459118f7ede7c8bea0fe795bff7c6c2ce287d01dd226202f7c9ebc0610a7836"}, + {file = "dataclasses-0.7.tar.gz", hash = "sha256:494a6dcae3b8bcf80848eea2ef64c0cc5cd307ffc263e17cdf42f3e5420808e6"}, +] distro = [ {file = "distro-1.5.0-py2.py3-none-any.whl", hash = "sha256:df74eed763e18d10d0da624258524ae80486432cd17392d9c3d96f5e83cd2799"}, {file = "distro-1.5.0.tar.gz", hash = "sha256:0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92"}, @@ -946,6 +1013,10 @@ idna = [ {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, ] +importlib-metadata = [ + {file = "importlib_metadata-2.0.0-py2.py3-none-any.whl", hash = "sha256:cefa1a2f919b866c5beb7c9f7b0ebb4061f30a8a9bf16d609b000e2dfaceb9c3"}, + {file = "importlib_metadata-2.0.0.tar.gz", hash = "sha256:77a540690e24b0305878c37ffd421785a6f7e53c8b5720d211b211de8d0e95da"}, +] jinja2 = [ {file = "Jinja2-2.11.2-py2.py3-none-any.whl", hash = "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"}, {file = "Jinja2-2.11.2.tar.gz", hash = "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"}, @@ -1205,3 +1276,7 @@ yamllint = [ {file = "yamllint-1.25.0-py2.py3-none-any.whl", hash = "sha256:c7be4d0d2584a1b561498fa9acb77ad22eb434a109725c7781373ae496d823b3"}, {file = "yamllint-1.25.0.tar.gz", hash = "sha256:b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519"}, ] +zipp = [ + {file = "zipp-3.4.0-py3-none-any.whl", hash = "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108"}, + {file = "zipp-3.4.0.tar.gz", hash = "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"}, +] diff --git a/pyproject.toml b/pyproject.toml index 3740f1e3..aa98c6a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,24 +5,24 @@ description = "" authors = ["neonmei "] [tool.poetry.dependencies] -python = "^3.8" +python = "^3.6" # Pin ansible version to that currently present on awx ansible = "==2.9.5" jinja2 = "^2.11.2" + +[tool.poetry.dev-dependencies] +pytest = "^5.2" +ansible-lint = "^4.3.5" +flake8 = "^3.8.4" selinux = "^0.2.1" -#molecule = {extras = ["docker"], version = "^2.20"} +yamllint = "^1.25.0" # minimum version is 3.0.3, because we need docker memory limitation # https://github.com/ansible-community/molecule/pull/2615 molecule = {extras = ["docker"], version = "==3.0.8"} testinfra = "^5.3.1" -[tool.poetry.dev-dependencies] -pytest = "^5.2" -ansible-lint = "^4.3.5" -flake8 = "^3.8" - [build-system] requires = ["poetry>=0.12"] build-backend = "poetry.masonry.api"