From 6041eacf3886283eea442db5f3c71d24cea56ac7 Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Fri, 2 Dec 2022 09:10:14 -0500 Subject: [PATCH 1/2] move to python3.11 and buster docker base image --- .python-version | 2 +- Dockerfile | 9 ++++++--- tox.ini | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.python-version b/.python-version index 8d7f852..afad818 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.4 +3.11.0 diff --git a/Dockerfile b/Dockerfile index 1dfc9aa..eaad593 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:alpine3.10 as build +FROM python:3.11.0-slim-buster as build RUN set -x \ && python3 -m venv /opt/conveyor @@ -7,14 +7,17 @@ ENV PATH="/opt/conveyor/bin:${PATH}" RUN pip --no-cache-dir --disable-pip-version-check install --upgrade pip setuptools wheel -RUN apk update && apk add g++ +RUN set -x \ + && apt-get update \ + && apt-get install --no-install-recommends -y \ + build-essential COPY requirements.txt /tmp/requirements.txt RUN set -x && pip --no-cache-dir --disable-pip-version-check install -r /tmp/requirements.txt -FROM python:alpine3.10 +FROM python:3.11.0-slim-buster ENV PYTHONUNBUFFERED 1 ENV PYTHONPATH /opt/conveyor/src/ diff --git a/tox.ini b/tox.ini index 188d284..ec6e900 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py310 +envlist = py311 skipsdist = True [testenv] From 1ef7edc41bcff9513c187fb824c887926360b859 Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Fri, 2 Dec 2022 09:11:12 -0500 Subject: [PATCH 2/2] remove unused cchardet dependency --- requirements.in | 1 - requirements.txt | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements.in b/requirements.in index 82e24c5..f098a90 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,3 @@ aiobotocore aiohttp -cchardet gunicorn diff --git a/requirements.txt b/requirements.txt index f337e7b..c8e8110 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # # pip-compile --output-file=requirements.txt requirements.in # @@ -20,8 +20,6 @@ attrs==22.1.0 # via aiohttp botocore==1.27.59 # via aiobotocore -cchardet==2.1.7 - # via -r requirements.in charset-normalizer==2.1.1 # via aiohttp frozenlist==1.3.3