From 3843ccdd1da3c288b2ebbf2aaa88798f18faaa5e Mon Sep 17 00:00:00 2001
From: Hong Minhee <hong.minhee@gmail.com>
Date: Sat, 16 Sep 2017 01:20:32 +0900
Subject: [PATCH 1/3] Reverse the order of editor supports and language
 runtimes

---
 README.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 89fbb27..495a5c5 100644
--- a/README.md
+++ b/README.md
@@ -96,21 +96,21 @@ See also the [list of Nirum-related projects][7] on GitHub.  Have you kicked off
 a new project related to Nirum?  Please add *nirum* [topic][8] to your project
 on GitHub!
 
-### Editor supports
+### Language runtimes
 
-- [nirum.vim](https://github.com/spoqa/nirum.vim): Nirum syntax highlighter for
-  Vim/Neovim.
-- [sublime-nirum](https://github.com/spoqa/sublime-nirum): Nirum package for
-  Sublime Text 3.
+ -   [nirum-python](https://github.com/spoqa/nirum-python): The official Python
+     runtime library for Nirum.
+     -   [nirim-python-http](https://github.com/spoqa/nirum-python-http):
+         Nirum HTTP transport for Python.
+     -   [nirum-python-wsgi](https://github.com/spoqa/nirum-python-wsgi):
+         Adapt Nirum services to WSGI apps.
 
-### Language runtimes
+### Editor supports
 
-- [nirum-python](https://github.com/spoqa/nirum-python): The official Python
-  runtime library for Nirum.
-    - [nirim-python-http](https://github.com/spoqa/nirum-python-http):
-      Nirum HTTP transport for Python.
-    - [nirum-python-wsgi](https://github.com/spoqa/nirum-python-wsgi):
-      Adapt Nirum services to WSGI apps.
+ -   [nirum.vim](https://github.com/spoqa/nirum.vim): Nirum syntax highlighter for
+     Vim/Neovim.
+ -   [sublime-nirum](https://github.com/spoqa/sublime-nirum): Nirum package for
+     Sublime Text 3.
 
 [7]: https://github.com/search?q=topic:nirum+fork:false
 [8]: https://github.com/blog/2309-introducing-topics

From 783fd1781ad52a1d82b56366eada729ee07ea244 Mon Sep 17 00:00:00 2001
From: Hong Minhee <hong.minhee@gmail.com>
Date: Sat, 16 Sep 2017 01:21:24 +0900
Subject: [PATCH 2/3] Link nirum.tmbundle

Close #159
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 495a5c5..eaa4886 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,9 @@ on GitHub!
 
 ### Editor supports
 
+ -   [nirum.tmbundle](https://github.com/spoqa/nirum.tmbundle): TextMate bundle
+     for Nirum.  Also can be used by IntelliJ IDEA (or any other JetBrain's
+     IDEs, e.g., PyCharm, WebStorm) through [TextMate bundles support][9].
  -   [nirum.vim](https://github.com/spoqa/nirum.vim): Nirum syntax highlighter for
      Vim/Neovim.
  -   [sublime-nirum](https://github.com/spoqa/sublime-nirum): Nirum package for
@@ -114,6 +117,7 @@ on GitHub!
 
 [7]: https://github.com/search?q=topic:nirum+fork:false
 [8]: https://github.com/blog/2309-introducing-topics
+[9]: https://github.com/spoqa/nirum.tmbundle#installation-intellij-idea-pycharm-etc
 
 
 Etymology

From 38af05831d341e1128e1dccd4e648423e0b3e191 Mon Sep 17 00:00:00 2001
From: Hong Minhee <hong.minhee@gmail.com>
Date: Sat, 16 Sep 2017 16:33:45 +0900
Subject: [PATCH 3/3] Fix build broken due to Python's zipfile bug

https://bugs.python.org/issue22201
---
 .travis.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b617fa0..f8ab819 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ matrix:
         - python3.6
         - libgmp10
         - upx-ucl
+env:
+- PIP_MINVER=9.0.1 SETUPTOOLS_MINVER=36.5.0
 cache:
   directories:
   - "$HOME/.stack"
@@ -39,12 +41,19 @@ before_install:
 - curl -o "$HOME/.local/bin/travis_long" -L https://raw.githubusercontent.com/futurice/fum2github/master/travis_long
 - chmod +x "$HOME/.local/bin/travis_long"
 install:
-- | 
-  if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then
-    pip3 install --user --upgrade tox pip setuptools
-  else
-    pip install --user --upgrade tox pip setuptools
+- |
+  if ! python3 -c "import pip"; then
+    if ! python3 -c "import setuptools"; then
+      pushd /tmp
+      curl -L "https://github.com/pypa/setuptools/archive/v$SETUPTOOLS_MINVER.tar.gz" | tar xvfz -
+      cd setuptools-*/
+      python3 bootstrap.py
+      python3 setup.py install --user
+      popd
+    fi
+    python3 -m easy_install --user -U "pip>=$PIP_MINVER"
   fi
+- python3 -m pip install --user --upgrade tox "pip>=$PIP_MINVER" setuptools
 - travis_long stack --no-terminal setup
 - travis_long stack --no-terminal install scan -j4
 script: