From f839a3f4f6518cb39ade11e87e0709f2fe2b1ca9 Mon Sep 17 00:00:00 2001
From: Ian Good <ian@icgood.net>
Date: Wed, 23 Sep 2020 08:20:36 -0400
Subject: [PATCH] Set version 0.20.2

---
 docker/Dockerfile  |  6 +++---
 docker/hooks/build |  4 ++--
 setup.py           | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a8897120..058227f7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,10 +2,10 @@ FROM python:3.8-alpine
 
 RUN pip install -U pip wheel setuptools typing-extensions
 
-ARG install_arg="pymap"
-ARG install_arg_opt="redis,admin,sieve,optional"
+ARG install_arg="pymap[redis,admin,sieve,optional]"
+ARG install_source=""
 RUN apk --update add --virtual build-dependencies python3-dev build-base \
-  && pip install "${install_arg}[${install_arg_opt}]" \
+  && pip install "${install_arg}${install_source}" \
   && apk del build-dependencies
 
 ENTRYPOINT ["pymap"]
diff --git a/docker/hooks/build b/docker/hooks/build
index 894b3162..0a2f8823 100644
--- a/docker/hooks/build
+++ b/docker/hooks/build
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -ex
 
-export install_arg="$GITHUB_REPO/archive/$SOURCE_BRANCH.tar.gz"
-docker build --build-arg install_arg -f $DOCKERFILE_PATH -t $IMAGE_NAME .
+export install_source=" @ $GITHUB_REPO/archive/$SOURCE_BRANCH.tar.gz"
+docker build --build-arg install_source -f $DOCKERFILE_PATH -t $IMAGE_NAME .
diff --git a/setup.py b/setup.py
index 90bab8b2..fb5e82af 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
     license = f.read()
 
 setup(name='pymap',
-      version='0.20.1',
+      version='0.20.2',
       author='Ian Good',
       author_email='ian@icgood.net',
       description='Lightweight, asynchronous IMAP serving in Python.',
@@ -49,12 +49,12 @@
       include_package_data=True,
       packages=find_packages(),
       install_requires=[
-          'pysasl >= 0.6.1',
-          'proxy-protocol >= 0.5.0',
+          'pysasl >= 0.6.2',
+          'proxy-protocol >= 0.5.5',
           'typing-extensions'],
       extras_require={
-          'redis': ['aioredis >= 1.3.0', 'msgpack >= 1.0'],
-          'admin': ['pymap-admin == 0.4.2'],
+          'redis': ['aioredis >= 1.3.1', 'msgpack >= 1.0'],
+          'admin': ['pymap-admin == 0.4.3'],
           'sieve': ['sievelib'],
           'systemd': ['systemd-python'],
           'optional': ['hiredis', 'passlib', 'pid']},