diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1df520d..1fc25a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8', '3.11'] + python-version: ['3.11'] steps: diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index 04d8577..0297537 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - python-version: ["3.8"] + python-version: ["3.11"] steps: - name: setup target branch @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ env.target_branch }} - + - name: setup python uses: actions/setup-python@v5 with: @@ -66,6 +66,6 @@ jobs: username: ${{secrets.EDX_SMTP_USERNAME}} password: ${{secrets.EDX_SMTP_PASSWORD}} subject: Upgrade python requirements workflow failed in ${{github.repository}} - to: arbi-bom@edx.org + to: arbi-bom@edx.org from: github-actions body: Upgrade python requirements workflow in ${{github.repository}} failed! For details see "github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" diff --git a/.gitignore b/.gitignore index 8608d08..cb824fd 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ swagger.yaml .swagger-codegen-ignore edx-api-stub-server/ swagger-build-artifacts/ +venv diff --git a/requirements/base.txt b/requirements/base.txt index 3ee5f7f..df7befa 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # boto==2.49.0 # via google-compute-engine -boto3==1.34.51 +boto3==1.35.6 # via -r requirements/base.in -botocore==1.34.51 +botocore==1.35.6 # via # -r requirements/base.in # boto3 @@ -17,7 +17,7 @@ distro==1.9.0 # via google-compute-engine google-compute-engine==2.8.13 # via -r requirements/base.in -jinja2==3.1.3 +jinja2==3.1.4 # via -r requirements/base.in jmespath==1.0.1 # via @@ -26,15 +26,15 @@ jmespath==1.0.1 # botocore markupsafe==2.1.5 # via jinja2 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via botocore -s3transfer==0.10.0 +s3transfer==0.10.2 # via boto3 six==1.16.0 # via # -r requirements/base.in # python-dateutil -urllib3==1.26.18 +urllib3==2.2.2 # via botocore # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index cc96177..ddee53c 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,17 +1,19 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # # make upgrade # -click==8.1.3 +build==1.2.1 # via pip-tools -pep517==0.12.0 +click==8.1.3 # via pip-tools +packaging==24.1 + # via build pip-tools==6.8.0 # via -r requirements/pip-tools.in -tomli==2.0.1 - # via pep517 +pyproject-hooks==1.1.0 + # via build wheel==0.37.1 # via pip-tools diff --git a/requirements/pip.txt b/requirements/pip.txt index 6665603..f0fca18 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -wheel==0.42.0 +wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.0 +pip==24.2 # via -r requirements/pip.in -setuptools==69.1.1 +setuptools==73.0.1 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index fb84d10..4922d28 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,32 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -build==1.0.3 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 +packaging==24.1 # via build -packaging==23.2 - # via build -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip_tools.in -pyproject-hooks==1.0.0 - # via - # build - # pip-tools -tomli==2.0.1 +pyproject-hooks==1.1.0 # via # build # pip-tools - # pyproject-hooks -wheel==0.42.0 +wheel==0.44.0 # via pip-tools -zipp==3.17.0 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/test.txt b/requirements/test.txt index 5e28903..4f068f0 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,48 +1,46 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -annotated-types==0.6.0 +annotated-types==0.7.0 # via pydantic -astroid==3.1.0 +astroid==3.2.4 # via pylint -attrs==23.2.0 +attrs==24.2.0 # via - # jschema-to-python # jsonschema # referencing - # sarif-om -aws-sam-translator==1.85.0 +aws-sam-translator==1.91.0 # via cfn-lint -aws-xray-sdk==2.12.1 +aws-xray-sdk==2.14.0 # via moto boto==2.49.0 # via # -r requirements/base.txt # google-compute-engine -boto3==1.34.51 +boto3==1.35.6 # via # -r requirements/base.txt # aws-sam-translator # moto -botocore==1.34.51 +botocore==1.35.6 # via # -r requirements/base.txt # aws-xray-sdk # boto3 # moto # s3transfer -certifi==2024.2.2 +certifi==2024.7.4 # via requests -cffi==1.16.0 +cffi==1.17.0 # via cryptography -cfn-lint==0.85.3 +cfn-lint==1.10.3 # via moto charset-normalizer==3.3.2 # via requests -cryptography==42.0.5 +cryptography==43.0.0 # via # moto # python-jose @@ -53,33 +51,26 @@ distro==1.9.0 # via # -r requirements/base.txt # google-compute-engine -docker==7.0.0 +docker==7.1.0 # via moto -ecdsa==0.18.0 +ecdsa==0.19.0 # via # moto # python-jose # sshpubkeys -exceptiongroup==1.2.0 - # via pytest future==1.0.0 # via pyresttest google-compute-engine==2.8.13 # via -r requirements/base.txt graphql-core==3.2.3 # via moto -idna==3.6 +idna==3.8 # via requests -importlib-resources==6.1.2 - # via - # jsonschema - # jsonschema-specifications - # openapi-spec-validator iniconfig==2.0.0 # via pytest isort==5.13.2 # via pylint -jinja2==3.1.3 +jinja2==3.1.4 # via # -r requirements/base.txt # moto @@ -88,30 +79,23 @@ jmespath==1.0.1 # -r requirements/base.txt # boto3 # botocore -jschema-to-python==1.2.3 - # via cfn-lint -jsondiff==2.0.0 +jsondiff==2.2.0 # via moto jsonpatch==1.33 # via cfn-lint -jsonpickle==3.0.3 - # via jschema-to-python -jsonpointer==2.4 +jsonpointer==3.0.0 # via jsonpatch -jsonschema==4.21.1 +jsonschema==4.23.0 # via # aws-sam-translator - # cfn-lint # openapi-schema-validator # openapi-spec-validator -jsonschema-path==0.3.2 +jsonschema-path==0.3.3 # via openapi-spec-validator jsonschema-specifications==2023.12.1 # via # jsonschema # openapi-schema-validator -junit-xml==1.9 - # via cfn-lint lazy-object-proxy==1.10.0 # via openapi-spec-validator markupsafe==2.1.5 @@ -129,135 +113,117 @@ moto[cloudformation]==4.2.14 # -r requirements/test.in mpmath==1.3.0 # via sympy -networkx==3.1 +networkx==3.3 # via cfn-lint openapi-schema-validator==0.6.2 # via openapi-spec-validator openapi-spec-validator==0.7.1 # via moto -packaging==23.2 - # via - # docker - # pytest +packaging==24.1 + # via pytest pathable==0.4.3 # via jsonschema-path -pbr==6.0.0 - # via - # jschema-to-python - # sarif-om pep8==1.7.1 # via -r requirements/test.in -pkgutil-resolve-name==1.3.10 - # via jsonschema -platformdirs==4.2.0 +platformdirs==4.2.2 # via pylint -pluggy==1.4.0 +pluggy==1.5.0 # via pytest py-partiql-parser==0.5.0 # via moto -pyasn1==0.5.1 +pyasn1==0.6.0 # via # python-jose # rsa -pycparser==2.21 +pycparser==2.22 # via cffi pycurl==7.45.3 # via pyresttest -pydantic==2.6.3 +pydantic==2.8.2 # via aws-sam-translator -pydantic-core==2.16.3 +pydantic-core==2.20.1 # via pydantic -pylint==3.1.0 +pylint==3.2.6 # via -r requirements/test.in -pyparsing==3.1.1 +pyparsing==3.1.4 # via moto pyresttest==1.7.1 # via -r requirements/test.in -pytest==8.0.2 +pytest==8.3.2 # via -r requirements/test.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # botocore # moto python-jose[cryptography]==3.3.0 # via moto -pyyaml==6.0.1 +pyyaml==6.0.2 # via # cfn-lint + # jsondiff # jsonschema-path # moto # pyresttest # responses -referencing==0.31.1 +referencing==0.35.1 # via # jsonschema # jsonschema-path # jsonschema-specifications -regex==2023.12.25 +regex==2024.7.24 # via cfn-lint -requests==2.31.0 +requests==2.32.3 # via # docker # jsonschema-path # moto # responses -responses==0.25.0 +responses==0.25.3 # via moto rfc3339-validator==0.1.4 # via openapi-schema-validator -rpds-py==0.18.0 +rpds-py==0.20.0 # via # jsonschema # referencing rsa==4.9 # via python-jose -s3transfer==0.10.0 +s3transfer==0.10.2 # via # -r requirements/base.txt # boto3 -sarif-om==1.0.4 - # via cfn-lint six==1.16.0 # via # -r requirements/base.txt # ecdsa - # junit-xml # python-dateutil # rfc3339-validator sshpubkeys==3.3.1 # via moto -sympy==1.12 +sympy==1.13.2 # via cfn-lint -tomli==2.0.1 - # via - # pylint - # pytest -tomlkit==0.12.4 +tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via - # annotated-types - # astroid # aws-sam-translator + # cfn-lint # pydantic # pydantic-core - # pylint -urllib3==1.26.18 +urllib3==2.2.2 # via # -r requirements/base.txt # botocore # docker # requests # responses -werkzeug==3.0.1 +werkzeug==3.0.4 # via moto wrapt==1.16.0 # via aws-xray-sdk xmltodict==0.13.0 # via moto -zipp==3.17.0 - # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/scripts/aws/bootstrap.py b/scripts/aws/bootstrap.py index cf905a2..a7824ab 100755 --- a/scripts/aws/bootstrap.py +++ b/scripts/aws/bootstrap.py @@ -14,8 +14,7 @@ def get_domain(api_base): """Returns a dictionary response for the specified domain or None if the domain does not exit""" - - client = boto3.client('apigateway', region_name=args.aws_region) # pylint: disable=used-before-assignment + client = boto3.client('apigateway', region_name=args.aws_region) # pylint: disable=possibly-used-before-assignment try: response = client.get_domain_name(domainName=api_base)