From e38ace6fed6f51f6735c970afd664e78f3beec45 Mon Sep 17 00:00:00 2001 From: scott Date: Sun, 7 Aug 2022 10:18:50 -0400 Subject: [PATCH 1/2] remove unused imports --- server/tests/test_main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/tests/test_main.py b/server/tests/test_main.py index bb1de90..e7d6939 100644 --- a/server/tests/test_main.py +++ b/server/tests/test_main.py @@ -1,6 +1,6 @@ from fastapi.testclient import TestClient -from app.main import app, BasicRequest, Options +from app.main import app client = TestClient(app) From 9a44e4af0216db3e05c032d493bc199e1559bafa Mon Sep 17 00:00:00 2001 From: scott Date: Sun, 7 Aug 2022 10:20:09 -0400 Subject: [PATCH 2/2] switch over to python 3.10 --- .circleci/config.yml | 6 +- server/requirements.in | 5 ++ server/requirements.txt | 171 ++++++++++++++++++++++++++++++---------- 3 files changed, 136 insertions(+), 46 deletions(-) create mode 100644 server/requirements.in diff --git a/.circleci/config.yml b/.circleci/config.yml index a3cde80..8eae554 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,13 +8,13 @@ jobs: build-and-test-server: executor: name: python/default - tag: "3.8" + tag: "3.10" steps: - checkout - run: name: Setup Virtual env command: | - virtualenv -p python3.8 env + virtualenv -p python3.10 env echo "source ./env/bin/activate" >> $BASH_ENV - run: name: Install Dependencies @@ -28,7 +28,7 @@ jobs: - run: name: Create Zipfile archive of Dependencies command: | - cd env/lib/python3.8/site-packages + cd env/lib/python3.10/site-packages zip -r9 ../../../../function.zip . - run: name: Add App to Zipfile diff --git a/server/requirements.in b/server/requirements.in new file mode 100644 index 0000000..4cc839d --- /dev/null +++ b/server/requirements.in @@ -0,0 +1,5 @@ +pytest +fastapi +mangum +datamodel_code_generator +genson diff --git a/server/requirements.txt b/server/requirements.txt index d52ccde..8f65d3d 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,50 +1,135 @@ -appdirs==1.4.4 -argcomplete==1.12.3 -asgiref==3.3.4 -attrs==21.2.0 -black==21.5b2 -certifi==2021.5.30 -chardet -click==8.0.1 -datamodel-code-generator==0.11.6 -dnspython==2.1.0 -email-validator==1.1.2 -fastapi==0.65.2 +# +# This file is autogenerated by pip-compile with python 3.10 +# To update, run: +# +# pip-compile server/requirements.in +# +anyio==3.6.1 + # via starlette +argcomplete==2.0.0 + # via datamodel-code-generator +atomicwrites==1.4.1 + # via pytest +attrs==22.1.0 + # via + # jsonschema + # pytest +black==22.6.0 + # via datamodel-code-generator +certifi==2022.6.15 + # via requests +chardet==4.0.0 + # via prance +charset-normalizer==2.1.0 + # via requests +click==8.1.3 + # via black +colorama==0.4.5 + # via + # click + # pytest +datamodel-code-generator==0.13.0 + # via -r server/requirements.in +dnspython==2.2.1 + # via email-validator +email-validator==1.2.1 + # via pydantic +fastapi==0.79.0 + # via -r server/requirements.in genson==1.2.2 -h11==0.12.0 -idna -importlib-metadata==4.5.0 -inflect==5.3.0 + # via + # -r server/requirements.in + # datamodel-code-generator +idna==3.3 + # via + # anyio + # email-validator + # requests +inflect==5.6.2 + # via datamodel-code-generator iniconfig==1.1.1 -isodate==0.6.0 -isort==5.8.0 -Jinja2==2.11.3 + # via pytest +isodate==0.6.1 + # via openapi-schema-validator +isort==5.10.1 + # via datamodel-code-generator +jinja2==3.1.2 + # via datamodel-code-generator jsonschema==3.2.0 -mangum==0.11.0 -MarkupSafe==2.0.1 -mypy==0.812 + # via + # openapi-schema-validator + # openapi-spec-validator +mangum==0.15.1 + # via -r server/requirements.in +markupsafe==2.1.1 + # via jinja2 mypy-extensions==0.4.3 -openapi-schema-validator==0.1.5 -openapi-spec-validator==0.3.1 -packaging==20.9 -pathspec==0.8.1 -pluggy==0.13.1 -prance==0.21.2 -py==1.10.0 -pydantic==1.8.2 -pyparsing==2.4.7 -pyrsistent==0.17.3 -PySnooper==0.5.0 -pytest==6.2.4 -PyYAML==5.4.1 -regex==2021.4.4 -requests + # via black +openapi-schema-validator==0.1.6 + # via openapi-spec-validator +openapi-spec-validator==0.3.3 + # via datamodel-code-generator +packaging==21.3 + # via pytest +pathspec==0.9.0 + # via black +platformdirs==2.5.2 + # via black +pluggy==1.0.0 + # via pytest +prance==0.21.8.0 + # via datamodel-code-generator +py==1.11.0 + # via pytest +pydantic[email]==1.9.1 + # via + # datamodel-code-generator + # fastapi +pyparsing==3.0.9 + # via packaging +pyrsistent==0.16.1 + # via + # jsonschema + # openapi-spec-validator +pysnooper==1.1.1 + # via datamodel-code-generator +pytest==7.1.2 + # via -r server/requirements.in +pyyaml==6.0 + # via openapi-spec-validator +requests==2.28.1 + # via prance +ruamel-yaml==0.17.21 + # via prance +ruamel-yaml-clib==0.2.6 + # via ruamel-yaml semver==2.13.0 + # via prance six==1.16.0 -starlette==0.14.2 + # via + # jsonschema + # openapi-schema-validator + # openapi-spec-validator + # prance + # pyrsistent +sniffio==1.2.0 + # via anyio +starlette==0.19.1 + # via fastapi toml==0.10.2 -typed-ast==1.4.3 -typing-extensions==3.10.0.0 -urllib3==1.26.5 -uvicorn==0.14.0 -zipp==3.4.1 + # via datamodel-code-generator +tomli==2.0.1 + # via + # black + # pytest +typed-ast==1.5.4 + # via datamodel-code-generator +typing-extensions==4.3.0 + # via + # mangum + # pydantic +urllib3==1.26.11 + # via requests + +# The following packages are considered to be unsafe in a requirements file: +# setuptools