diff --git a/Makefile b/Makefile index 2f7cffc8..7b51030b 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,9 @@ PREFIX=$(shell p='$(TEST_PREFIX)'; echo "$${p:-test}") TEST_PROCESSES := $(if $(TEST_PROCESSES),$(TEST_PROCESSES),2) TEST_FILES := $(if $(TEST_FILES),$(TEST_FILES),tests/integration/test_*.py) -PIP_VERSION=20.1.1 -SETUPTOOLS_VERSION=49.1.0 -PIP_TOOLS_VERSION=5.2.1 +PIP_VERSION=21.0.1 +SETUPTOOLS_VERSION=52.0.0 +PIP_TOOLS_VERSION=5.5.0 .PHONY: vendor vendor: download_wheels diff --git a/README.md b/README.md index c9dfa6b4..7919607b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Run Mendix in Cloud Foundry -![Integration Test Status](https://github.com/mendix/cf-mendix-buildpack/workflows/Run%20Integration%20Tests/badge.svg) [![Known Vulnerabilities](https://snyk.io/test/github/mendix/cf-mendix-buildpack/badge.svg)](https://snyk.io/test/github/mendix/cf-mendix-buildpack) +![Integration Test Status](https://github.com/mendix/cf-mendix-buildpack/workflows/Run%20Integration%20Tests/badge.svg?branch=develop) [![Known Vulnerabilities](https://snyk.io/test/github/mendix/cf-mendix-buildpack/badge.svg)](https://snyk.io/test/github/mendix/cf-mendix-buildpack) This document contains general information on the Mendix Cloud Foundry Buildpack. diff --git a/requirements-dev.in b/requirements-dev.in index f13feec3..7c0c6e9a 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,10 +1,6 @@ -backoff==1.10.0 black==19.10b0 -certifi==2020.12.5 cryptography==3.2.1 idna==2.8 -Jinja2==2.11.2 nose-timer==1.0.0 pylint==2.5.3 pyopenssl==19.1.0 -requests==2.24.0 diff --git a/requirements.in b/requirements.in index f0c93b74..8911cb8e 100644 --- a/requirements.in +++ b/requirements.in @@ -1,9 +1,8 @@ backoff==1.10.0 certifi==2020.12.5 -httplib2==0.18.1 -jinja2==2.11.2 +httplib2==0.19.0 +jinja2==2.11.3 omegaconf==2.0.0 psycopg2-binary==2.8.5 -pyyaml==5.3.1 -requests==2.24.0 -urllib3==1.25.11 # Remediation for CVE-2020-26137; can be removed if requests is updated +pyyaml==5.4.1 +requests==2.25.1 diff --git a/requirements.txt b/requirements.txt index 12b6c200..688a8d2f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,17 +4,37 @@ # # pip-compile requirements.in # -backoff==1.10.0 # via -r requirements.in -certifi==2020.12.5 # via -r requirements.in, requests -chardet==3.0.4 # via requests -dataclasses==0.7 # via omegaconf -httplib2==0.18.1 # via -r requirements.in -idna==2.8 # via requests -jinja2==2.11.2 # via -r requirements.in -markupsafe==1.1.1 # via jinja2 -omegaconf==2.0.0 # via -r requirements.in -psycopg2-binary==2.8.5 # via -r requirements.in -pyyaml==5.3.1 # via -r requirements.in, omegaconf -requests==2.24.0 # via -r requirements.in -typing-extensions==3.7.4.2 # via omegaconf -urllib3==1.25.11 # via -r requirements.in, requests +backoff==1.10.0 + # via -r requirements.in +certifi==2020.12.5 + # via + # -r requirements.in + # requests +chardet==3.0.4 + # via requests +dataclasses==0.7 + # via omegaconf +httplib2==0.19.0 + # via -r requirements.in +idna==2.8 + # via requests +jinja2==2.11.3 + # via -r requirements.in +markupsafe==1.1.1 + # via jinja2 +omegaconf==2.0.0 + # via -r requirements.in +psycopg2-binary==2.8.5 + # via -r requirements.in +pyparsing==2.4.7 + # via httplib2 +pyyaml==5.4.1 + # via + # -r requirements.in + # omegaconf +requests==2.25.1 + # via -r requirements.in +typing-extensions==3.7.4.2 + # via omegaconf +urllib3==1.25.11 + # via requests diff --git a/vendor/wheels/Jinja2-2.11.2-py2.py3-none-any.whl b/vendor/wheels/Jinja2-2.11.3-py2.py3-none-any.whl similarity index 81% rename from vendor/wheels/Jinja2-2.11.2-py2.py3-none-any.whl rename to vendor/wheels/Jinja2-2.11.3-py2.py3-none-any.whl index 8127278e..883596a0 100644 Binary files a/vendor/wheels/Jinja2-2.11.2-py2.py3-none-any.whl and b/vendor/wheels/Jinja2-2.11.3-py2.py3-none-any.whl differ diff --git a/vendor/wheels/PyYAML-5.3.1.tar.gz b/vendor/wheels/PyYAML-5.3.1.tar.gz deleted file mode 100644 index 915d67b3..00000000 Binary files a/vendor/wheels/PyYAML-5.3.1.tar.gz and /dev/null differ diff --git a/vendor/wheels/PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl b/vendor/wheels/PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl new file mode 100644 index 00000000..59998e32 Binary files /dev/null and b/vendor/wheels/PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl differ diff --git a/vendor/wheels/httplib2-0.18.1-py3-none-any.whl b/vendor/wheels/httplib2-0.19.0-py3-none-any.whl similarity index 76% rename from vendor/wheels/httplib2-0.18.1-py3-none-any.whl rename to vendor/wheels/httplib2-0.19.0-py3-none-any.whl index ad510884..bd6bdc94 100644 Binary files a/vendor/wheels/httplib2-0.18.1-py3-none-any.whl and b/vendor/wheels/httplib2-0.19.0-py3-none-any.whl differ diff --git a/vendor/wheels/pip-20.1.1-py2.py3-none-any.whl b/vendor/wheels/pip-20.1.1-py2.py3-none-any.whl deleted file mode 100644 index ea1d0f7c..00000000 Binary files a/vendor/wheels/pip-20.1.1-py2.py3-none-any.whl and /dev/null differ diff --git a/vendor/wheels/pip-21.0.1-py3-none-any.whl b/vendor/wheels/pip-21.0.1-py3-none-any.whl new file mode 100644 index 00000000..6d55137b Binary files /dev/null and b/vendor/wheels/pip-21.0.1-py3-none-any.whl differ diff --git a/vendor/wheels/pyparsing-2.4.7-py2.py3-none-any.whl b/vendor/wheels/pyparsing-2.4.7-py2.py3-none-any.whl new file mode 100644 index 00000000..773bcf62 Binary files /dev/null and b/vendor/wheels/pyparsing-2.4.7-py2.py3-none-any.whl differ diff --git a/vendor/wheels/requests-2.24.0-py2.py3-none-any.whl b/vendor/wheels/requests-2.24.0-py2.py3-none-any.whl deleted file mode 100644 index 4609b061..00000000 Binary files a/vendor/wheels/requests-2.24.0-py2.py3-none-any.whl and /dev/null differ diff --git a/vendor/wheels/requests-2.25.1-py2.py3-none-any.whl b/vendor/wheels/requests-2.25.1-py2.py3-none-any.whl new file mode 100644 index 00000000..8d70e971 Binary files /dev/null and b/vendor/wheels/requests-2.25.1-py2.py3-none-any.whl differ diff --git a/vendor/wheels/setuptools-49.1.0-py3-none-any.whl b/vendor/wheels/setuptools-52.0.0-py3-none-any.whl similarity index 64% rename from vendor/wheels/setuptools-49.1.0-py3-none-any.whl rename to vendor/wheels/setuptools-52.0.0-py3-none-any.whl index 597198cd..9eb776ec 100644 Binary files a/vendor/wheels/setuptools-49.1.0-py3-none-any.whl and b/vendor/wheels/setuptools-52.0.0-py3-none-any.whl differ