diff --git a/ask-resources.json b/ask-resources.json index ccb032bb..5cf39e05 100644 --- a/ask-resources.json +++ b/ask-resources.json @@ -13,7 +13,7 @@ "skillInfrastructure": { "type": "@ask-cli/lambda-deployer", "userConfig": { - "runtime": "python3.7", + "runtime": "python3.8", "handler": "lambda_function.lambda_handler", "awsRegion": "us-east-1" } @@ -31,7 +31,7 @@ "skillInfrastructure": { "type": "@ask-cli/lambda-deployer", "userConfig": { - "runtime": "python3.7", + "runtime": "python3.8", "handler": "lambda_function.lambda_handler", "awsRegion": "us-east-1" } diff --git a/hooks/build.sh b/hooks/build.sh index 6eac8be2..0793e979 100755 --- a/hooks/build.sh +++ b/hooks/build.sh @@ -73,7 +73,8 @@ install_dependencies() { venv/bin/python -m pip --disable-pip-version-check install -r mycity/deploy_tools/requirements.txt -t ./ ${QQ:+-qq} venv/bin/python -m pip --disable-pip-version-check install --no-deps -r mycity/deploy_tools/requirements_no_deps.txt -t ./ ${QQ:+-qq} - venv/bin/python -m pip --disable-pip-version-check install --upgrade "../mycity/mycity/deploy_tools/linux_wheels/python_crfsuite-0.9.6-cp37-cp37m-manylinux1_x86_64.whl" -t ./ ${QQ:+-qq} + venv/bin/python -m pip --disable-pip-version-check install --upgrade "../mycity/mycity/deploy_tools/linux_wheels/python_crfsuite-0.9.7-cp38-cp38-manylinux1_x86_64.whl" -t ./ ${QQ:+-qq} + venv/bin/python -m pip --disable-pip-version-check install --upgrade "../mycity/mycity/deploy_tools/linux_wheels/ujson-4.0.2-cp38-cp38-manylinux1_x86_64.whl" -t ./ ${QQ:+-qq} return $? } diff --git a/mycity/mycity/deploy_tools/linux_wheels/python_crfsuite-0.9.6-cp37-cp37m-manylinux1_x86_64.whl b/mycity/mycity/deploy_tools/linux_wheels/python_crfsuite-0.9.6-cp37-cp37m-manylinux1_x86_64.whl deleted file mode 100644 index 3208462e..00000000 Binary files a/mycity/mycity/deploy_tools/linux_wheels/python_crfsuite-0.9.6-cp37-cp37m-manylinux1_x86_64.whl and /dev/null differ diff --git a/mycity/mycity/deploy_tools/linux_wheels/python_crfsuite-0.9.7-cp38-cp38-manylinux1_x86_64.whl b/mycity/mycity/deploy_tools/linux_wheels/python_crfsuite-0.9.7-cp38-cp38-manylinux1_x86_64.whl new file mode 100644 index 00000000..0258ee87 Binary files /dev/null and b/mycity/mycity/deploy_tools/linux_wheels/python_crfsuite-0.9.7-cp38-cp38-manylinux1_x86_64.whl differ diff --git a/mycity/mycity/deploy_tools/linux_wheels/ujson-4.0.2-cp38-cp38-manylinux1_x86_64.whl b/mycity/mycity/deploy_tools/linux_wheels/ujson-4.0.2-cp38-cp38-manylinux1_x86_64.whl new file mode 100644 index 00000000..ffb096ef Binary files /dev/null and b/mycity/mycity/deploy_tools/linux_wheels/ujson-4.0.2-cp38-cp38-manylinux1_x86_64.whl differ diff --git a/mycity/mycity/deploy_tools/requirements.txt b/mycity/mycity/deploy_tools/requirements.txt index c7bb2af5..3d57c4a4 100644 --- a/mycity/mycity/deploy_tools/requirements.txt +++ b/mycity/mycity/deploy_tools/requirements.txt @@ -4,11 +4,15 @@ codecov==2.0.15 coverage==4.5.1 idna==2.6 nose==1.3.7 +ntlm-auth==1.5.0 requests==2.22.0 +requests-ntlm==1.1.0 +requests-toolbelt==0.9.1 six==1.11.0 street-address==0.3.0 +ujson==4.0.2 usaddress==0.5.0 -urllib3>=1.23 +urllib3>=1.25,<1.26 beautifulsoup4==4.6.0 python-dateutil==2.8.0 -pytz==2017.3 +pytz==2017.3 \ No newline at end of file diff --git a/mycity/mycity/deploy_tools/requirements_no_deps.txt b/mycity/mycity/deploy_tools/requirements_no_deps.txt index 025cf7bd..3f76907f 100644 --- a/mycity/mycity/deploy_tools/requirements_no_deps.txt +++ b/mycity/mycity/deploy_tools/requirements_no_deps.txt @@ -1 +1 @@ -arcgis==1.4.0 +arcgis==1.8.4