Merge branch 'hotfix/0.18.2'

Author: felliott

CHANGELOG

@@ -2,6 +2,11 @@
 ChangeLog
 *********
 
+0.18.2 (2017-01-04)
+===================
+- Happy New Year!
+- Fix: Be more ruthless about fixing setuptools breakage in Dockerfile. (thanks, @cwisecarver!)
+
 0.18.1 (2016-12-13)
 ===================
 - Pin setuptools to v30.4.0 to avoid package-namespace-related breakage.

Dockerfile

@@ -52,6 +52,8 @@ RUN mkdir -p /code
 WORKDIR /code
 
 RUN pip install -U pip
+RUN pip uninstall -y setuptools
+RUN rm -f /usr/local/lib/python3.5/site-packages/mfr-nspkg.pth
 RUN pip install setuptools==30.4.0
 
 COPY ./requirements.txt /code/

mfr/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.18.1'
+__version__ = '0.18.2'
 __import__('pkg_resources').declare_namespace(__name__)