From 932ce4233c99d28788086b67003991eb6f51294f Mon Sep 17 00:00:00 2001
From: amecea <flavius@presslabs.com>
Date: Tue, 1 Sep 2020 13:56:06 +0300
Subject: [PATCH 1/2] Bump aiohttp, marshmallow, webargs to latest versions

---
 colibris/__init__.py |  2 +-
 requirements/dev.txt |  2 +-
 setup.py             | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/colibris/__init__.py b/colibris/__init__.py
index 3793d66..5cdaf96 100644
--- a/colibris/__init__.py
+++ b/colibris/__init__.py
@@ -14,7 +14,7 @@
 from colibris import template
 
 
-VERSION = '0.9.1'
+VERSION = '0.9.2'
 
 
 def setup():
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 1ec930c..28aec4c 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,3 +1,3 @@
 tox==3.13.2
-pytest==5.0.0
+pytest==6.0.1
 pycodestyle==2.5.0
diff --git a/setup.py b/setup.py
index 6dac4fe..e6c0149 100644
--- a/setup.py
+++ b/setup.py
@@ -27,16 +27,16 @@ def find_version():
     name='colibris',
     version=find_version(),
     install_requires=[
-        'aiohttp>=3.5.0,<=3.5.4',
+        'aiohttp>=3.5.0,<3.7',
         'aiohttp-apispec>=1.5',
         'apispec>=3.0.0',
         'async-timeout',
-        'marshmallow>=3.0.0b19,<=3.0.0rc7',
-        'marshmallow_peewee==2.3.0',
+        'marshmallow>=3.0.0b19,<3.8',
+        'marshmallow_peewee>=2.3.0,<3.1',
         'peewee>=3.9',
-        'peewee-migrate==1.1.6',
+        'peewee-migrate>=1.1.6',
         'python-dotenv',
-        'webargs>=5.2.0,<=5.3.2'
+        'webargs>=5.2.0,<6.0'
     ],
     url='https://github.com/colibris-framework/colibris',
     license='BSD',

From c94137173b2d950c8d61e7f5aa1a21f2c5986d36 Mon Sep 17 00:00:00 2001
From: amecea <flavius@presslabs.com>
Date: Tue, 1 Sep 2020 17:43:55 +0300
Subject: [PATCH 2/2] Bump python-base docker image

---
 extra/Dockerfile.python-base | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extra/Dockerfile.python-base b/extra/Dockerfile.python-base
index aead097..6a44c26 100644
--- a/extra/Dockerfile.python-base
+++ b/extra/Dockerfile.python-base
@@ -1,16 +1,16 @@
 # Build with:
 #    docker build -t colibris/python-base -f Dockerfile.python-base .
 
-FROM python:3.7-slim-stretch
+FROM python:3.8-slim-buster as builder
 
 # Make sure we have an up-to-date OS + python installation
-RUN apt-get update && apt-get -y upgrade && \
-    apt-get -y install build-essential git python-dev wait-for-it
+RUN apt update && apt -y upgrade && \
+    apt -y install build-essential python-dev wait-for-it
 
 # Install pipenv and lock down the version for the sake of reproducibility
-RUN pip install pipenv==2018.11.26
+RUN pip install pipenv==2020.8.13
 
 # Cleanup
-RUN apt-get clean autoclean && \
-    apt-get autoremove --yes && \
+RUN apt clean autoclean && \
+    apt autoremove --yes && \
     rm -rf /var/lib/{apt,dpkg,cache,log}/