up mimimum wagtail version, upped python postgres for dev/tests

This commit is contained in:
Seb 2022-05-18 09:40:30 +10:00
parent 312397e628
commit 5d0659dde2
4 changed files with 43 additions and 45 deletions

View File

@ -1,48 +1,48 @@
stages:
- test
- lint
- release
- test
- lint
- release
python:
stage: test
image: python:3.8
services:
- name: liminspace/mjml-tcpserver:latest
alias: mjml
- postgres:9.6
variables:
POSTGRES_USER: postgres
POSTGRES_DB: birdsong
POSTGRES_PASSWORD: ""
POSTGRES_HOST_AUTH_METHOD: trust
before_script:
- pip3 install psycopg2-binary~=2.8.0 -e .
script:
- python3 runtests.py --no-input
stage: test
image: python:3.10
services:
- name: liminspace/mjml-tcpserver:latest
alias: mjml
- postgres:14
variables:
POSTGRES_USER: postgres
POSTGRES_DB: birdsong
POSTGRES_PASSWORD: ""
POSTGRES_HOST_AUTH_METHOD: trust
before_script:
- pip3 install psycopg2-binary~=2.8.0 -e .
script:
- python3 runtests.py --no-input
flake8:
stage: lint
image: python:3.8
before_script:
- pip install flake8
script:
- flake8 birdsong/ tests/
stage: lint
image: python:3.10
before_script:
- pip install flake8
script:
- flake8 birdsong/ tests/
isort:
stage: lint
image: python:3.8
before_script:
- pip install isort -e .
script:
- isort --recursive --diff --check-only birdsong/ tests/
stage: lint
image: python:3.10
before_script:
- pip install isort -e .
script:
- isort --recursive --diff --check-only birdsong/ tests/
build:
image: python:3.8
stage: release
before_script:
- pip install --upgrade setuptools wheel twine
script:
- ./setup.py sdist bdist_wheel
- twine upload dist/*
only:
- tags
image: python:3.10
stage: release
before_script:
- pip install --upgrade setuptools wheel twine
script:
- ./setup.py sdist bdist_wheel
- twine upload dist/*
only:
- tags

View File

@ -1,4 +1,4 @@
FROM python:3.6
FROM python:3.10
WORKDIR /srv

View File

@ -6,8 +6,7 @@ services:
POSTGRES_DB: birdsong
POSTGRES_USER: birdsong_dev
POSTGRES_PASSWORD: password
restart: always
image: postgres:9.6
image: postgres:14
expose:
- "5432"
birdsong:
@ -31,7 +30,6 @@ services:
# - './local.sqlite3:/srv/local.sqlite3'
mjml:
image: liminspace/mjml-tcpserver:latest
restart: always
ports:
- "28101"
container_name: 'birdsong_mjml'

View File

@ -20,7 +20,7 @@ setup(
author_email='developers@neonjungle.studio',
install_requires=[
'wagtail>=2.7',
'wagtail>=2.15',
'django-mjml',
],
setup_requires=[