diff --git a/Makefile b/Makefile index fda3095..693b70c 100644 --- a/Makefile +++ b/Makefile @@ -64,10 +64,10 @@ test: clean upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in - pip install -q -r requirements/pip_tools.txt - pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in + python -m pip install pip-tools pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in - pip install -qr requirements/pip.txt pip install -qr requirements/pip_tools.txt + pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in + pip install -qr requirements/pip.txt pip-compile --upgrade -o requirements/base.txt requirements/base.in pip-compile --upgrade -o requirements/test.txt requirements/test.in diff --git a/requirements/base.txt b/requirements/base.txt index 0685389..b62f182 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,14 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # boto==2.49.0 # via google-compute-engine -boto3==1.42.31 - # via -r requirements/base.in -botocore==1.42.31 +boto3==1.37.38 + # via + # -c /Users/adusenbery/code/api-manager/requirements/constraints.txt + # -r requirements/base.in +botocore==1.37.38 # via # -r requirements/base.in # boto3 @@ -24,17 +26,17 @@ jmespath==1.0.1 # -r requirements/base.in # boto3 # botocore -markupsafe==3.0.3 +markupsafe==2.1.5 # via jinja2 python-dateutil==2.9.0.post0 # via botocore -s3transfer==0.16.0 +s3transfer==0.11.5 # via boto3 six==1.17.0 # via # -r requirements/base.in # python-dateutil -urllib3==2.6.3 +urllib3==1.26.20 # via botocore # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/constraints.txt b/requirements/constraints.txt index f9ea41a..6e1f8dd 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,3 +10,11 @@ # This file contains all common constraints for edx-repos -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + +# Need to pin this as long as we're on Python 3.8 in this codebase +# https://pypi.org/project/boto3/1.38.0/ +boto3<1.38 + +# 7.0 dropped support for Python 3.8 +# https://pypi.org/project/pip-tools/7.0.0/ +pip-tools<7.0 diff --git a/requirements/pip-tools.in b/requirements/pip-tools.in deleted file mode 100644 index 27192c8..0000000 --- a/requirements/pip-tools.in +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies to run compile tools --c constraints.txt - -pip-tools # Contains pip-compile, used to generate pip requirements files \ No newline at end of file diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt deleted file mode 100644 index ddee53c..0000000 --- a/requirements/pip-tools.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# make upgrade -# -build==1.2.1 - # via pip-tools -click==8.1.3 - # via pip-tools -packaging==24.1 - # via build -pip-tools==6.8.0 - # via -r requirements/pip-tools.in -pyproject-hooks==1.1.0 - # via build -wheel==0.37.1 - # via pip-tools - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/requirements/pip.txt b/requirements/pip.txt index 929f3ee..b88d538 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -8,7 +8,7 @@ wheel==0.45.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==25.3 +pip==25.0.1 # via -r requirements/pip.in -setuptools==80.9.0 +setuptools==75.3.3 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 572bb75..7e983e2 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,23 +1,31 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # -build==1.4.0 +build==1.2.2.post1 # via pip-tools -click==8.3.1 +click==8.1.8 # via pip-tools -packaging==25.0 +importlib-metadata==8.5.0 # via build -pip-tools==7.5.2 - # via -r requirements/pip_tools.in +packaging==26.0 + # via build +pip-tools==6.14.0 + # via + # -c requirements/constraints.txt + # -r requirements/pip_tools.in pyproject-hooks==1.2.0 + # via build +tomli==2.4.0 # via # build # pip-tools wheel==0.45.1 # via pip-tools +zipp==3.20.2 + # 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 facd119..ed7986b 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # annotated-types==0.7.0 # via pydantic -astroid==4.0.3 +astroid==3.2.4 # via pylint -attrs==25.4.0 +attrs==25.3.0 # via # jsonschema # referencing @@ -18,132 +18,140 @@ aws-xray-sdk==2.15.0 # via moto boto==2.49.0 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # google-compute-engine -boto3==1.42.31 +boto3==1.37.38 # via - # -r requirements/base.txt + # -c /Users/adusenbery/code/api-manager/requirements/constraints.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # aws-sam-translator # moto -botocore==1.42.31 +botocore==1.37.38 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # aws-xray-sdk # boto3 # moto # s3transfer certifi==2026.1.4 # via requests -cffi==2.0.0 +cffi==1.17.1 # via cryptography -cfn-lint==1.41.0 +cfn-lint==1.26.1 # via moto charset-normalizer==3.4.4 # via requests -cryptography==46.0.3 +cryptography==46.0.4 # via # joserfc # moto -dill==0.4.1 +dill==0.4.0 # via pylint distro==1.9.0 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # google-compute-engine docker==7.1.0 # via moto +exceptiongroup==1.3.1 + # via pytest future==1.0.0 # via pyresttest google-compute-engine==2.8.13 - # via -r requirements/base.txt + # via -r /Users/adusenbery/code/api-manager/requirements/base.txt graphql-core==3.2.7 # via moto idna==3.11 # via requests -iniconfig==2.3.0 +importlib-resources==6.4.5 + # via + # jsonschema + # jsonschema-specifications + # openapi-spec-validator +iniconfig==2.1.0 # via pytest -isort==7.0.0 +isort==5.13.2 # via pylint jinja2==3.1.6 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # moto jmespath==1.0.1 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # boto3 # botocore -joserfc==1.6.1 +joserfc==1.2.2 # via moto jsonpatch==1.33 # via cfn-lint jsonpointer==3.0.0 # via jsonpatch -jsonschema==4.26.0 +jsonschema==4.23.0 # via # aws-sam-translator # openapi-schema-validator # openapi-spec-validator jsonschema-path==0.3.4 # via openapi-spec-validator -jsonschema-specifications==2025.9.1 +jsonschema-specifications==2023.12.1 # via # jsonschema # openapi-schema-validator -lazy-object-proxy==1.12.0 +lazy-object-proxy==1.10.0 # via openapi-spec-validator -markupsafe==3.0.3 +markupsafe==2.1.5 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # jinja2 # werkzeug mccabe==0.7.0 # via pylint mock==5.2.0 # via -r requirements/test.in -moto[cloudformation]==5.1.20 +moto[cloudformation]==5.0.28 # via -r requirements/test.in mpmath==1.3.0 # via sympy -networkx==3.6.1 +networkx==3.1 # via cfn-lint openapi-schema-validator==0.6.3 # via openapi-spec-validator openapi-spec-validator==0.7.2 # via moto -packaging==25.0 +packaging==26.0 # via pytest pathable==0.4.4 # via jsonschema-path pep8==1.7.1 # via -r requirements/test.in -platformdirs==4.5.1 +pkgutil-resolve-name==1.3.10 + # via jsonschema +platformdirs==4.3.6 # via pylint -pluggy==1.6.0 +pluggy==1.5.0 # via pytest -py-partiql-parser==0.6.3 +py-partiql-parser==0.6.1 # via moto pycparser==2.23 # via cffi pycurl==7.45.7 # via pyresttest -pydantic==2.12.5 +pydantic==2.10.6 # via aws-sam-translator -pydantic-core==2.41.5 +pydantic-core==2.27.2 # via pydantic -pygments==2.19.2 - # via pytest -pylint==4.0.4 +pylint==3.2.7 # via -r requirements/test.in -pyparsing==3.3.1 +pyparsing==3.1.4 # via moto pyresttest==1.7.1 # via -r requirements/test.in -pytest==9.0.2 +pytest==8.3.5 # via -r requirements/test.in python-dateutil==2.9.0.post0 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # botocore # moto pyyaml==6.0.3 @@ -153,14 +161,14 @@ pyyaml==6.0.3 # moto # pyresttest # responses -referencing==0.36.2 +referencing==0.35.1 # via # jsonschema # jsonschema-path # jsonschema-specifications -regex==2026.1.15 +regex==2024.11.6 # via cfn-lint -requests==2.32.5 +requests==2.32.4 # via # docker # jsonschema-path @@ -170,46 +178,54 @@ responses==0.25.8 # via moto rfc3339-validator==0.1.4 # via openapi-schema-validator -rpds-py==0.30.0 +rpds-py==0.20.1 # via # jsonschema # referencing -s3transfer==0.16.0 +s3transfer==0.11.5 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # boto3 six==1.17.0 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # python-dateutil # rfc3339-validator -sympy==1.14.0 +sympy==1.13.3 # via cfn-lint -tomlkit==0.14.0 +tomli==2.4.0 + # via + # pylint + # pytest +tomlkit==0.13.3 # via pylint -typing-extensions==4.15.0 +typing-extensions==4.13.2 # via + # annotated-types + # astroid # aws-sam-translator # cfn-lint + # cryptography + # exceptiongroup + # graphql-core # pydantic # pydantic-core - # referencing - # typing-inspection -typing-inspection==0.4.2 - # via pydantic -urllib3==2.6.3 + # pylint +urllib3==1.26.20 # via - # -r requirements/base.txt + # -r /Users/adusenbery/code/api-manager/requirements/base.txt # botocore # docker # requests # responses -werkzeug==3.1.5 +werkzeug==3.0.6 # via moto wrapt==2.0.1 # via aws-xray-sdk -xmltodict==1.0.2 +xmltodict==0.15.0 # via moto +zipp==3.20.2 + # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools