From a12bc50ce6e7742f14789a02d95de27f0ad46816 Mon Sep 17 00:00:00 2001 From: Jordi Soucheiron Date: Fri, 16 Feb 2024 22:36:11 +0100 Subject: [PATCH] Upgrade requirements to work in 3.8 --- cfripper/cli.py | 2 +- requirements-dev.txt | 9 +++++++-- requirements-docs.txt | 8 ++++++-- requirements.txt | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/cfripper/cli.py b/cfripper/cli.py index e6209019..e1739711 100644 --- a/cfripper/cli.py +++ b/cfripper/cli.py @@ -145,7 +145,7 @@ def validate_aws_principals(ctx: click.Context, param: str, value: str) -> Optio @click.command() -@click.version_option(prog_name="cfripper", version=version("package-name")) +@click.version_option(prog_name="cfripper", version=version("cfripper")) @click.argument("templates", type=click.File("r"), nargs=-1) @click.option( "--resolve/--no-resolve", diff --git a/requirements-dev.txt b/requirements-dev.txt index 9172cc5a..7d6df272 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,8 +15,10 @@ coverage==7.4.1 cryptography==42.0.3 docker==7.0.0 ecdsa==0.18.0 +exceptiongroup==1.2.0 graphql-core==3.2.3 idna==3.6 +importlib-resources==6.1.1 iniconfig==2.0.0 jinja2==3.1.3 jmespath==1.0.1 @@ -34,12 +36,13 @@ markupsafe==2.1.5 moto==5.0.1 mpmath==1.3.0 multipart==0.2.4 -networkx==3.2.1 +networkx==3.1 openapi-schema-validator==0.6.2 openapi-spec-validator==0.7.1 packaging==23.2 pathable==0.4.3 pbr==6.0.0 +pkgutil-resolve-name==1.3.10 pluggy==0.13.1 py-partiql-parser==0.5.1 pyasn1==0.5.1 @@ -67,9 +70,11 @@ setuptools==69.1.0 six==1.16.0 sshpubkeys==3.3.1 sympy==1.12 +tomli==2.0.1 typing-extensions==4.9.0 -urllib3==2.0.7 +urllib3==1.26.18 uv==0.1.2 werkzeug==3.0.1 wrapt==1.16.0 xmltodict==0.13.0 +zipp==3.17.0 diff --git a/requirements-docs.txt b/requirements-docs.txt index a3dab6c5..153d7686 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -16,11 +16,13 @@ cryptography==42.0.3 csscompressor==0.9.5 docker==7.0.0 ecdsa==0.18.0 +exceptiongroup==1.2.0 ghp-import==2.1.0 graphql-core==3.2.3 htmlmin==0.1.12 idna==3.6 importlib-metadata==7.0.1 +importlib-resources==6.1.1 iniconfig==2.0.0 jinja2==3.1.3 jmespath==1.0.1 @@ -46,12 +48,13 @@ mkdocs-minify-plugin==0.5.0 moto==5.0.1 mpmath==1.3.0 multipart==0.2.4 -networkx==3.2.1 +networkx==3.1 openapi-schema-validator==0.6.2 openapi-spec-validator==0.7.1 packaging==23.2 pathable==0.4.3 pbr==6.0.0 +pkgutil-resolve-name==1.3.10 pluggy==0.13.1 py-partiql-parser==0.5.1 pyasn1==0.5.1 @@ -83,8 +86,9 @@ six==1.16.0 sshpubkeys==3.3.1 sympy==1.12 termcolor==2.4.0 +tomli==2.0.1 typing-extensions==4.9.0 -urllib3==2.0.7 +urllib3==1.26.18 uv==0.1.2 watchdog==4.0.0 werkzeug==3.0.1 diff --git a/requirements.txt b/requirements.txt index 34acd56f..15c460e6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,4 @@ pyyaml==6.0.1 s3transfer==0.10.0 six==1.16.0 typing-extensions==4.9.0 -urllib3==2.0.7 +urllib3==1.26.18