Skip to content

Commit

Permalink
Remedy bit rot (#737)
Browse files Browse the repository at this point in the history
* find an upgraded combination of python deps so (1) docker builds again, (2) pipenv works on aarch64, (3) all major security vulnerabilities are gone.

* stash away minimal nix env to develop both on x86 and aarch64.

* update release notes.
  • Loading branch information
c0c0n3 authored Aug 13, 2023
1 parent b12954a commit 93e6d8c
Show file tree
Hide file tree
Showing 6 changed files with 1,500 additions and 998 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM python:3.8.5-alpine3.12 as base
FROM python:3.8.17-alpine3.18 as base
FROM base as builder
RUN apk --no-cache --update-cache add gcc python3 python3-dev py-pip build-base wget
RUN apk --no-cache --update-cache add gcc python3 python3-dev py-pip build-base wget rust cargo
RUN ln -s /usr/include/locale.h /usr/include/xlocale.h
RUN pip install --upgrade pip
RUN pip install pipenv
RUN mkdir -p /src/ngsi-timeseries-api
COPY Pipfile /src/ngsi-timeseries-api/Pipfile
Expand Down
29 changes: 16 additions & 13 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,42 @@ name = "pypi"

[packages]
bitmath = "~=1.3"
certifi = "==2018.10.15"
"connexion[swagger-ui]" = "~=2.2"
click = "~=7.1"
certifi = "==2023.7.22"
# The latest connexion is 2.14.2 which requires Flask < 2.3.
# So the latest Flask we can install is 2.2.5. (If you install 2.3.0 you'll
# get `AttributeError: module 'flask.json' has no attribute 'JSONEncoder'`
# b/c Flask 2.3.0 removed JSONEncoder.
"connexion[swagger-ui]" = "~=2.14"
click = "~=8.1"
crate = "~=0.22"
flask = "~=1.1.0"
flask = "==2.2.5"
geojson = "~=2.4"
geomet = "~=0.2"
gunicorn = "~=20.1"
pg8000 = "==1.23.0"
pickle-mixin = "==1.0.2"
pydantic = "~=1.8"
pydantic = "~=1.10"
pymongo = "~=3.4"
python-dateutil = ">=2.7"
pyyaml = ">=4.2"
python-dateutil = "~=2.8"
pyyaml = "~=6.0"
objsize = "~=0.3"
redis = "~=3.5"
requests = ">=2.20"
redis = "~=4.6"
requests = "~=2.31"
rq = "~=1.8"
geopy = "~=2.2.0"

[dev-packages]
# run `pipenv install --dev` to get the packages below in your env
aiohttp = ">=3.7.4"
aiohttp = "~=3.8"
backoff = "~=1.1"
matplotlib = "~=3.3"
pandas = "~=1.1"
pytest-lazy-fixture = "~=0.6.3"
pytest-flask = "~=0.10"
pytest = "~=3.0"
pytest-flask = "~=1.2"
pytest = "~=5.0"
pytest-cov = "~=2.7.1"
coveralls = "~=2.0"
lovely-pytest-docker = "~=0.3.0"
pyyaml = "~=5.4"

[requires]
python_version = "3.8"
Loading

0 comments on commit 93e6d8c

Please sign in to comment.