diff --git a/Dockerfile b/Dockerfile index 6e245fd53..fad521d50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,8 +58,6 @@ RUN apt-get update && \ curl ca-certificates gnupg git runit libpq-dev \ postgresql-client build-essential libxmlsec1-dev \ pkg-config libmaxminddb0 && \ - pip install lxml==4.6.4 --no-cache-dir && \ - export C_INCLUDE_PATH=/usr/local/lib/python3.10/site-packages/lxml/includes && \ pip install -r /requirements.txt --no-cache-dir && \ apt-get remove --purge -y build-essential git && \ apt-get autoremove --purge -y && \ diff --git a/Pipfile b/Pipfile index 1bcef351e..2f787564a 100644 --- a/Pipfile +++ b/Pipfile @@ -32,8 +32,7 @@ geoip2 = "*" gunicorn = "*" kubernetes = "==v19.15.0" ldap3 = "*" -# 4.7.0 and later remove `lxml-version.h` which is required by xmlsec -lxml = "==4.6.5" +lxml = "*" packaging = "*" psycopg2-binary = "*" pycryptodome = "*" diff --git a/Pipfile.lock b/Pipfile.lock index dc59c8f4b..e2f1b3a50 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ba1371e813190a2e25b49788b7ba6071c8ef61f512043b71d343681003387b9b" + "sha256": "dedb51159ef09fd9b00ab28022706f525c9df057ffd646e2a552784341a10538" }, "pipfile-spec": 6, "requires": {}, @@ -196,7 +196,7 @@ "sha256:1ef33f089e0a494e8d1b487508356f055c865b1955b125c00c991a4358543c80", "sha256:8eca49962b1bfc09c24d442aa55688be88efe5c24aeef89d3be135614b95c678" ], - "markers": "python_version >= '3.7' and python_version < '4'", + "markers": "python_version >= '3.7' and python_full_version < '4.0.0'", "version": "==1.9.0" }, "cbor2": { @@ -325,7 +325,7 @@ "sha256:a0713dc7a1de3f06bc0df5a9567ad19ead2d3d5689b434768a6145bff77c0667", "sha256:f184f0d851d96b6d29297354ed981b7dd71df7ff500d82fa6d11f0856bee8035" ], - "markers": "python_version < '4' and python_full_version >= '3.6.2'", + "markers": "python_full_version >= '3.6.2' and python_full_version < '4.0.0'", "version": "==0.3.0" }, "click-plugins": { @@ -1455,9 +1455,7 @@ "version": "==4.1.1" }, "urllib3": { - "extras": [ - "secure" - ], + "extras": [], "hashes": [ "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece", "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844" @@ -2418,9 +2416,7 @@ "version": "==4.0.1" }, "urllib3": { - "extras": [ - "secure" - ], + "extras": [], "hashes": [ "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece", "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"