From 27caf032a68e827c6d19b466312d9c7b779978a5 Mon Sep 17 00:00:00 2001
From: Tyson Clugg <tyson@clugg.net>
Date: Wed, 6 Jan 2016 15:54:58 +1100
Subject: [PATCH] Don't include meteor build in wheel or sdist builds.

---
 .gitignore  |  8 ++++----
 MANIFEST.in | 14 ++++++++------
 setup.py    | 10 ----------
 tox.ini     |  2 +-
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92c772f..c41cec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,9 @@ docs/node_modules/
 .cache/
 .coverage
 .tox/
-htmlcov/
-tests/report/
+/htmlcov/
+/report/
 
 # meteor
-dddp/test/build/
-dddp/test/meteor_todos/.meteor/
+test/build/
+test/meteor_todos/.meteor/
diff --git a/MANIFEST.in b/MANIFEST.in
index 179f6d0..e3799b7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,16 +1,18 @@
-include LICENSE
 include *.rst
 include *.sh
 include *.txt
-include requirements*.txt
 include .gitignore
+include LICENSE
+include requirements*.txt
 include Makefile
-exclude tox.ini
-graft tests/meteor_todos
-prune tests/build
-prune tests/meteor_todos/.meteor/local
 graft docs
+graft tests
 prune docs/_build
 prune docs/node_modules
+prune tests/build
+prune tests/meteor_todos/.meteor/local
+prune */__pycache__
+prune *.pyc
 exclude .travis.yml.ok
 exclude .travis.yml
+exclude tox.ini
diff --git a/setup.py b/setup.py
index b0802e2..87ffd31 100755
--- a/setup.py
+++ b/setup.py
@@ -127,15 +127,6 @@ class build_meteor(setuptools.command.build_py.build_py):
         )
 
 
-class build_py(setuptools.command.build_py.build_py):
-
-    def run(self):
-        if build_meteor.has_meteor_builds(self.distribution):
-            self.reinitialize_command('build_meteor', inplace=False)
-            self.run_command('build_meteor')
-        return setuptools.command.build_py.build_py.run(self)
-
-
 class build_ext(setuptools.command.build_ext.build_ext):
 
     def run(self):
@@ -261,7 +252,6 @@ setuptools.setup(
     ],
     cmdclass={
         'build_ext': build_ext,
-        'build_py': build_py,
         'build_meteor': build_meteor,
     },
     options={
diff --git a/tox.ini b/tox.ini
index 9ee0806..e81c998 100644
--- a/tox.ini
+++ b/tox.ini
@@ -120,7 +120,7 @@ install_command=sh -c 'pip install -U "setuptools>=18.5" "wheel>=0.25.0" "pip>=7
 whitelist_externals=sh
 
 commands =
-    check-manifest --ignore "tests/build*,tests/meteor_todos/.meteor/local*"
+    check-manifest
     {envpython} setup.py --no-user-cfg sdist --dist-dir={toxinidir}/dist/
     {envpython} setup.py --no-user-cfg bdist_wheel --dist-dir={toxinidir}/dist/
     sh -c "cd docs && sphinx-build -b html -d _build/doctrees -D latex_paper_size=a4  . _build/html"