Merge tag '0.18.1' into develop

CenterForOpenScience · Dec 13, 2016 · 014bf18 · 014bf18
2 parents e5ec534 + faa6f0a
commit 014bf18
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,7 @@ before_install:
 
 install:
   - travis_retry pip install --upgrade pip
+  - travis_retry pip install setuptools==30.4.0
   - travis_retry pip install wheel==0.26.0
   - travis_retry pip install invoke==0.11.1
   - travis_retry invoke wheelhouse --develop

diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,10 @@
 ChangeLog
 *********
 
+0.18.1 (2016-12-13)
+===================
+- Pin setuptools to v30.4.0 to avoid package-namespace-related breakage.
+
 0.18.0 (2016-10-31)
 ===================
 - HALLOWEEN RELEASE!

diff --git a/Dockerfile b/Dockerfile
@@ -52,6 +52,7 @@ RUN mkdir -p /code
 WORKDIR /code
 
 RUN pip install -U pip
+RUN pip install setuptools==30.4.0
 
 COPY ./requirements.txt /code/
 

diff --git a/mfr/__init__.py b/mfr/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.18.0'
+__version__ = '0.18.1'
 __import__('pkg_resources').declare_namespace(__name__)
diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,7 @@ humanfriendly==2.1
 invoke==0.11.1
 mako==1.0.1
 raven==5.27.0
+setuptools==30.4.0
 stevedore==1.2.0
 tornado==4.3