Separate requirement files

noirbizarre · noirbizarre · commit 4c4199716247 · 2013-07-23T14:41:34.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -14,8 +14,8 @@ matrix:
         -   python: 3.3
             env: DJANGO='django>=1.4,<1.5'
 install:
-  - pip install $DJANGO pep8 --use-mirrors
-  - pip install python-coveralls --use-mirrors
+  - pip install $DJANGO --use-mirrors
+  - pip install -r requirements/travis.pip --use-mirrors
 script:
   - make coverage pep8
 after_success:
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -50,6 +50,7 @@ A Makefile is provided to simplify the common tasks:
        make pep8             Run the PEP8 report
        make pylint           Run the pylint report
        make doc              Generate the documentation
+       make minify           Minify all JS files with yuglify
        make dist             Generate a distributable package
        make minify           Minify Django.js with yuglify
        make clean            Remove all temporary and generated artifacts
@@ -70,14 +71,7 @@ and ensure the documentation is generating.
 You can run the javascript test suite in the browser (http://localhost:8000).
 Javascript tests are run in the test suite too, but it runs on the minified version of the javascript libary.
 
-You can either minify it manually by running the provided script
-
-.. code-block:: console
-
-    $ ./minify.sh
-    $ python manage.py test djangojs
-
-or use the Makefile ``minify`` task that minify the javascript:
+You can use the Makefile ``minify`` task that minify the javascript:
 
 .. code-block:: console
 
diff --git a/Makefile b/Makefile
@@ -14,6 +14,7 @@ help:
 	@echo '   make pep8             Run the PEP8 report                         '
 	@echo '   make pylint           Run the pylint report                       '
 	@echo '   make doc              Generate the documentation                  '
+	@echo '   make minify           Minify all JS files with yuglify            '
 	@echo '   make dist             Generate a distributable package            '
 	@echo '   make minify           Minify Django.js with yuglify               '
 	@echo '   make clean            Remove all temporary and generated artifacts'
@@ -53,7 +54,8 @@ dist:
 	@echo 'Done'
 
 minify:
-	@./minify.sh
+	@echo 'Minifying javascript'
+	@yuglify djangojs/static/js/djangojs/django.js
 
 clean:
 	rm -fr $(DISTDIR)
diff --git a/requirements/develop.pip b/requirements/develop.pip
@@ -1,4 +1,3 @@
 -r install.pip
-pep8
-pylint
-coverage
+-r test.pip
+-r reporting.pip
diff --git a/requirements/reporting.pip b/requirements/reporting.pip
@@ -0,0 +1,3 @@
+pep8
+pylint
+coverage
diff --git a/requirements/test.pip b/requirements/test.pip
diff --git a/requirements/travis.pip b/requirements/travis.pip
@@ -0,0 +1,3 @@
+-r test.pip
+-r reporting.pip
+python-coveralls

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-r test.pip`
	`2`	`+-r reporting.pip`
	`3`	`+python-coveralls`