Skip to content
Snippets Groups Projects
Commit a0b5cf7d authored by Bastien Abadie's avatar Bastien Abadie
Browse files

Merge branch 'py3.6' into 'master'

Bump to Python 3.6

See merge request !269
parents 279a6062 dae35c21
No related branches found
No related tags found
1 merge request!269Bump to Python 3.6
image: registry.gitlab.com/arkindex/backend:base-0.8.8
image: registry.gitlab.com/arkindex/backend:base-0.9.3
stages:
- test
......
FROM registry.gitlab.com/arkindex/backend:base-0.8.8
FROM registry.gitlab.com/arkindex/backend:base-0.9.3
ARG COMMON_BRANCH=master
ARG COMMON_ID=9855787
......
......@@ -8,7 +8,7 @@ Backend for Historical Manuscripts Indexing
* Clone of the [architecture](https://gitlab.com/arkindex/architecture)
* Git
* Make
* Python 3.5+
* Python 3.6+
* pip
* [virtualenvwrapper](https://virtualenvwrapper.readthedocs.io/en/latest/)
......
FROM python:3.5-alpine as base
FROM python:3.6-alpine as base
FROM base as staging
......@@ -16,7 +16,7 @@ FROM base
# Import from staging the python build, so the final image is slimmer
# and has no build tool
COPY --from=staging /build /usr
ENV PYTHONPATH=/usr/lib/python3.5/site-packages
ENV PYTHONPATH=/usr/lib/python3.6/site-packages
# Add runtime system deps
RUN apk add --update --no-cache wget gzip libmagic git unzip libpq libxslt libjpeg imagemagick
......
......@@ -30,6 +30,7 @@ setup(
author='Teklia',
author_email='abadie@teklia.com',
url='https://arkindex.teklia.com',
python_requires='>=3.6',
install_requires=install_requires,
test_suite='arkindex.project.runtests.run',
tests_require=tests_requires,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment