From f4fc7e9642c5470a1062ddbf3398500c761002c7 Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Wed, 19 Oct 2022 22:30:21 +0200 Subject: [PATCH] cleanup setuptools --- .github/workflows/test.yaml | 1 - Dockerfile | 3 +- poetry.lock | 87 ++++++++++--------------------------- pyproject.toml | 2 - 4 files changed, 25 insertions(+), 68 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ce8129d..a1ffd66 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,7 +22,6 @@ jobs: - name: Install dependencies run: | poetry install - poetry run pip install setuptools - name: Test run: poetry run pytest --cov=. --cov-branch --cov-report term-missing:skip-covered working-directory: ./src/ diff --git a/Dockerfile b/Dockerfile index ca4d5f6..fe88bf5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,7 @@ COPY pyproject.toml poetry.lock ./ RUN python -m venv --copies /app/venv \ && . /app/venv/bin/activate \ - && poetry install $POETRY_OPTIONS \ - && python -m pip install setuptools + && poetry install $POETRY_OPTIONS ENV PATH /app/venv/bin:$PATH COPY src ./src/ diff --git a/poetry.lock b/poetry.lock index dce9906..8db1a56 100644 --- a/poetry.lock +++ b/poetry.lock @@ -52,7 +52,7 @@ python-versions = ">=3.5" dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"] docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"] tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"] -tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"] +tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"] [[package]] name = "beautifulsoup4" @@ -85,9 +85,6 @@ category = "dev" optional = false python-versions = ">=2.7" -[package.dependencies] -setuptools = "*" - [[package]] name = "certifi" version = "2022.9.24" @@ -124,7 +121,7 @@ optional = false python-versions = ">=3.6.0" [package.extras] -unicode-backport = ["unicodedata2"] +unicode_backport = ["unicodedata2"] [[package]] name = "click" @@ -206,7 +203,7 @@ django = ">=2.0" requests = ">=2.4.3" [package.extras] -amazon-ses = ["boto3"] +amazon_ses = ["boto3"] dev = ["flake8", "sphinx", "sphinx-rtd-theme", "tox", "twine", "wheel"] postal = ["cryptography"] @@ -352,9 +349,6 @@ category = "main" optional = false python-versions = ">=3.5" -[package.dependencies] -setuptools = ">=3.0" - [package.extras] eventlet = ["eventlet (>=0.24.1)"] gevent = ["gevent (>=1.4.0)"] @@ -398,7 +392,7 @@ python-versions = "*" [[package]] name = "kolo" -version = "2.0.5" +version = "2.0.6" description = "See everything happening in your running Django app" category = "dev" optional = false @@ -412,7 +406,7 @@ toolz = ">=0.11.1" ulid-py = ">=1.1.0" [package.extras] -test-generation = ["jinja2 (>=3.0.0)"] +test_generation = ["jinja2 (>=3.0.0)"] [[package]] name = "lxml" @@ -425,7 +419,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*" [package.extras] cssselect = ["cssselect (>=0.7)"] html5 = ["html5lib"] -htmlsoup = ["BeautifulSoup4"] +htmlsoup = ["beautifulsoup4"] source = ["Cython (>=0.29.7)"] [[package]] @@ -460,7 +454,7 @@ python-versions = ">=3.5, <4" [package.extras] all = ["pygments (>=2.7.3)"] -code-syntax-highlighting = ["pygments (>=2.7.3)"] +code_syntax_highlighting = ["pygments (>=2.7.3)"] [[package]] name = "model-bakery" @@ -515,9 +509,6 @@ category = "dev" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*" -[package.dependencies] -setuptools = "*" - [[package]] name = "packaging" version = "21.3" @@ -531,7 +522,7 @@ pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" [[package]] name = "phonenumberslite" -version = "8.12.56" +version = "8.12.57" description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers." category = "main" optional = false @@ -729,7 +720,7 @@ pytest = ">=5.4.0" [package.extras] docs = ["sphinx", "sphinx-rtd-theme"] -testing = ["Django", "django-configurations (>=2.0)"] +testing = ["django", "django-configurations (>=2.0)"] [[package]] name = "pytest-env" @@ -765,7 +756,6 @@ python-versions = ">= 3.6" [package.dependencies] pytest = ">=5.3" -setuptools = ">=40.0" [[package]] name = "python-gitlab" @@ -803,9 +793,9 @@ python-versions = ">=3.6" colorama = {version = "*", markers = "platform_system == \"Windows\""} [package.extras] -all = ["pillow", "pytest", "pytest", "pytest-cov", "tox", "zest.releaser[recommended]"] +all = ["pillow", "pytest", "pytest", "pytest-cov", "tox", "zest.releaser"] dev = ["pytest", "tox"] -maintainer = ["zest.releaser[recommended]"] +maintainer = ["zest.releaser"] pil = ["pillow"] test = ["pytest", "pytest-cov"] @@ -846,7 +836,7 @@ urllib3 = ">=1.21.1,<1.27" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "requests-toolbelt" @@ -859,19 +849,6 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [package.dependencies] requests = ">=2.0.1,<3.0.0" -[[package]] -name = "setuptools" -version = "65.5.0" -description = "Easily download, build, install, upgrade, and uninstall Python packages" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mock", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] -testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] - [[package]] name = "six" version = "1.16.0" @@ -955,14 +932,6 @@ python-versions = "*" [package.dependencies] types-urllib3 = "<1.27" -[[package]] -name = "types-setuptools" -version = "65.5.0.1" -description = "Typing stubs for setuptools" -category = "dev" -optional = false -python-versions = "*" - [[package]] name = "types-toml" version = "0.10.8" @@ -973,7 +942,7 @@ python-versions = "*" [[package]] name = "types-urllib3" -version = "1.26.25" +version = "1.26.25.1" description = "Typing stubs for urllib3" category = "dev" optional = false @@ -989,7 +958,7 @@ python-versions = ">=3.7" [[package]] name = "tzdata" -version = "2022.4" +version = "2022.5" description = "Provider of IANA time zone data" category = "main" optional = false @@ -1067,7 +1036,7 @@ python-versions = ">=3.7" Brotli = {version = "*", optional = true, markers = "extra == \"brotli\""} [package.extras] -brotli = ["Brotli"] +brotli = ["brotli"] [[package]] name = "wrapt" @@ -1092,7 +1061,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "1196b4a15eaf21ee12e58f12c74bd6ee7d810d06d5e7f97f4fa5aa7719f85873" +content-hash = "5f48b05e5b1d1da0754f77235e0b8f58acb05d822d1ab4bca32a8bf7e5ace475" [metadata.files] argon2-cffi = [ @@ -1416,8 +1385,8 @@ invoke = [ {file = "invoke-1.7.3.tar.gz", hash = "sha256:41b428342d466a82135d5ab37119685a989713742be46e42a3a399d685579314"}, ] kolo = [ - {file = "kolo-2.0.5-py3-none-any.whl", hash = "sha256:2e113c60e251cdfc053970ff0ff02ba92d54b5d76727938179a0b3eb00462007"}, - {file = "kolo-2.0.5.tar.gz", hash = "sha256:a1f6067ac372e1596c72a0e53fd3ca5ca83aa824d384d73bf430c1b9b5cad39e"}, + {file = "kolo-2.0.6-py3-none-any.whl", hash = "sha256:9bd63b318bf37a2b1eb544ffd58b8d210926939bb7baa3fb388814ee4313bb6a"}, + {file = "kolo-2.0.6.tar.gz", hash = "sha256:e6435fafc55b3c80f36c37032ca8b2083b80c89d66630f44376bc863bd54ea4e"}, ] lxml = [ {file = "lxml-4.9.1-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:98cafc618614d72b02185ac583c6f7796202062c41d2eeecdf07820bad3295ed"}, @@ -1607,8 +1576,8 @@ packaging = [ {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, ] phonenumberslite = [ - {file = "phonenumberslite-8.12.56-py2.py3-none-any.whl", hash = "sha256:33c0513b03df77bcc797b48387c84ee24151d8cb904cf4775acf00bb353ed92e"}, - {file = "phonenumberslite-8.12.56.tar.gz", hash = "sha256:067533c2a8e29b64b08cddae115068a1d6a3fbfa5bddc76bc27a4a6f8891b7d8"}, + {file = "phonenumberslite-8.12.57-py2.py3-none-any.whl", hash = "sha256:438b993ff2fd25956f31aa6a4ed693130635e39ceebf15d3d96bb64dd22d85f0"}, + {file = "phonenumberslite-8.12.57.tar.gz", hash = "sha256:8940c6f887aabb5d1a6095dbc6e35144d0b53f75a9e9b2018e2703d9b9a71090"}, ] pillow = [ {file = "Pillow-9.2.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:a9c9bc489f8ab30906d7a85afac4b4944a572a7432e00698a7239f44a44e6efb"}, @@ -1823,10 +1792,6 @@ requests-toolbelt = [ {file = "requests-toolbelt-0.10.0.tar.gz", hash = "sha256:f695d6207931200b46c8ef6addbc8a921fb5d77cc4cd209c2e7d39293fcd2b30"}, {file = "requests_toolbelt-0.10.0-py2.py3-none-any.whl", hash = "sha256:64c6b8c51b515d123f9f708a29743f44eb70c4479440641ed2df8c4dea56d985"}, ] -setuptools = [ - {file = "setuptools-65.5.0-py3-none-any.whl", hash = "sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356"}, - {file = "setuptools-65.5.0.tar.gz", hash = "sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17"}, -] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, @@ -1867,25 +1832,21 @@ types-requests = [ {file = "types-requests-2.28.11.2.tar.gz", hash = "sha256:fdcd7bd148139fb8eef72cf4a41ac7273872cad9e6ada14b11ff5dfdeee60ed3"}, {file = "types_requests-2.28.11.2-py3-none-any.whl", hash = "sha256:14941f8023a80b16441b3b46caffcbfce5265fd14555844d6029697824b5a2ef"}, ] -types-setuptools = [ - {file = "types-setuptools-65.5.0.1.tar.gz", hash = "sha256:5b297081c8f1fbd992cd8b305a97ed96ee6ffc765e9115124029597dd10b8a71"}, - {file = "types_setuptools-65.5.0.1-py3-none-any.whl", hash = "sha256:601d45b5e9979d2b931de5403aa11153626a1eadd1ce9727b21f24673ced5ceb"}, -] types-toml = [ {file = "types-toml-0.10.8.tar.gz", hash = "sha256:b7e7ea572308b1030dc86c3ba825c5210814c2825612ec679eb7814f8dd9295a"}, {file = "types_toml-0.10.8-py3-none-any.whl", hash = "sha256:8300fd093e5829eb9c1fba69cee38130347d4b74ddf32d0a7df650ae55c2b599"}, ] types-urllib3 = [ - {file = "types-urllib3-1.26.25.tar.gz", hash = "sha256:5aef0e663724eef924afa8b320b62ffef2c1736c1fa6caecfc9bc6c8ae2c3def"}, - {file = "types_urllib3-1.26.25-py3-none-any.whl", hash = "sha256:c1d78cef7bd581e162e46c20a57b2e1aa6ebecdcf01fd0713bb90978ff3e3427"}, + {file = "types-urllib3-1.26.25.1.tar.gz", hash = "sha256:a948584944b2412c9a74b9cf64f6c48caf8652cb88b38361316f6d15d8a184cd"}, + {file = "types_urllib3-1.26.25.1-py3-none-any.whl", hash = "sha256:f6422596cc9ee5fdf68f9d547f541096a20c2dcfd587e37c804c9ea720bf5cb2"}, ] typing-extensions = [ {file = "typing_extensions-4.4.0-py3-none-any.whl", hash = "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"}, {file = "typing_extensions-4.4.0.tar.gz", hash = "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"}, ] tzdata = [ - {file = "tzdata-2022.4-py2.py3-none-any.whl", hash = "sha256:74da81ecf2b3887c94e53fc1d466d4362aaf8b26fc87cda18f22004544694583"}, - {file = "tzdata-2022.4.tar.gz", hash = "sha256:ada9133fbd561e6ec3d1674d3fba50251636e918aa97bd59d63735bef5a513bb"}, + {file = "tzdata-2022.5-py2.py3-none-any.whl", hash = "sha256:323161b22b7802fdc78f20ca5f6073639c64f1a7227c40cd3e19fd1d0ce6650a"}, + {file = "tzdata-2022.5.tar.gz", hash = "sha256:e15b2b3005e2546108af42a0eb4ccab4d9e225e2dfbf4f77aad50c70a4b1f3ab"}, ] ulid-py = [ {file = "ulid-py-1.1.0.tar.gz", hash = "sha256:dc6884be91558df077c3011b9fb0c87d1097cb8fc6534b11f310161afd5738f0"}, diff --git a/pyproject.toml b/pyproject.toml index 006753a..77f6133 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,6 @@ django-two-factor-auth = {extras = ["phonenumberslite"], version = ">=1.14"} beautifulsoup4 = ">=4.10.0" django-environ = ">=0.9.0" django-extensions = ">=3.2.1" -setuptools = ">=65.4.0" [tool.poetry.dev-dependencies] pre-commit = ">=2.7" @@ -40,7 +39,6 @@ invoke = ">=1.6.0" mypy = ">=0.981" types-Markdown = ">=3.3.10" types-requests = ">=2.26.3" -types-setuptools = ">=65" types-toml = ">=0.10.1" types-beautifulsoup4 = ">=4.10.7" types-Pillow = ">=9.2"