Remove redundant kalite/packages/dist/Django-1.5.12-py2.7.egg-info le…

…arningequality#5419

Makefile

@@ -26,8 +26,8 @@ clean-build:
 	rm -fr dist/
 	rm -rf .kalite_dist_tmp
 	rm -fr .eggs/
-	rm -fr dist-packages/
-	rm -fr dist-packages-temp/
+	rm -fr kalite/packages/dist/*
+	rm -fr .pip-temp/
 	rm -fr kalite/database/templates
 	rm -fr kalite/static-libraries/docs
 	find . -name '*.egg-info' -exec rm -fr {} +
@@ -106,9 +106,7 @@ sdist: clean docs assets
 	python setup.py sdist --formats=$(format) --static
 
 dist: clean docs assets
-	# python setup.py sdist --formats=$(format)
 	python setup.py bdist_wheel
-	# python setup.py sdist --formats=$(format) --static
 	python setup.py bdist_wheel --static  # --no-clean
 	ls -l dist
 

requirements.txt

@@ -5,7 +5,8 @@
 # https://github.com/django/django/blob/master/tests/staticfiles_tests/apps/test/static/test/%E2%8A%97.txt
 # ...to explain: Some of the below packages depend on django, if we don't
 # specify a version here, we'll get the latest.
-django<1.6
+# See also: https://github.com/learningequality/ka-lite/issues/5419
+django==1.5.12
 
 docopt>=0.6,<0.7
 South==1.0.2

setup.py

@@ -239,6 +239,7 @@ def install_distributions(distributions):
         opts.build_dir = STATIC_DIST_PACKAGES_TEMP
         opts.download_cache = STATIC_DIST_PACKAGES_DOWNLOAD_CACHE
         opts.isolated = True
+        opts.ignore_installed = True
         opts.compile = False
         opts.ignore_dependencies = False
         # This is deprecated and will disappear in Pip 10
@@ -247,14 +248,18 @@ def install_distributions(distributions):
         # opts.no_binary = ':all:'  # Do not use any binary files (whl)
         opts.no_clean = NO_CLEAN
         command.run(opts, distributions)
-        # requirement_set.source_dir = STATIC_DIST_PACKAGES_TEMP
-        # requirement_set.install(opts)
 
     # Install requirements into kalite/packages/dist
     if DIST_BUILDING_COMMAND:
         install_distributions(RAW_REQUIREMENTS)
-        # Now remove Django because it's bundled
-        shutil.rmtree(os.path.join(STATIC_DIST_PACKAGES, "django"))
+
+        # Now remove Django because it's bundled. It gets installed as an egg
+        # so unfortunately, the path is a bit dependent on the specific
+        # version installed (we pinned it for reliability in requirements.txt)
+        shutil.rmtree(
+            os.path.join(STATIC_DIST_PACKAGES, "Django-1.5.12-py2.7.egg-info"),
+            ignore_errors=False
+        )
 
 # It's not a build command with --static or it's not a build command at all
 else: