making nose not required for travis

Author: Josh Mervine

Makefile

@@ -1,17 +1,16 @@
 # Setup
 ###
-target=build
-source=src
+target=$(PWD)/build
+source=$(PWD)/src
 
-pypath=PYTHONPATH=./$(target):./maxcdn:$(PYTHONPATH)
+pypath=PYTHONPATH=$(target):./maxcdn:$(PYTHONPATH)
 
-nose=./$(source)/nose/bin/nosetests
+nose_opts=-v
+nose=python $(source)/nose/bin/nosetests
+cov_opts= --with-coverage --cover-package=maxcdn
 
 tests=./test/test.py
 int=./test/int.py
-test_opts=-v
-cov_opts= --with-coverage --cover-package=maxcdn
-
 
 # Tasks
 ###
@@ -27,21 +26,23 @@ clean:
 coverage: build/coverage
 	$(pypath) python $(nose) $(cov_opts) $(tests)
 
-test:
-	$(pypath) python $(nose) $(test_opts) $(tests)
+nose: build/nose
+	$(pypath) $(nose) $(nose_opts) $(tests)
 
-int:
-	$(pypath) python $(nose) $(test_opts) $(int)
+nose/int: build/nose
+	$(pypath) $(nose) $(nose_opts) $(int)
 
-test/help:
-	$(nose) --help | less
+test:
+	$(pypath) python $(tests)
+
+test/32:
+	$(pypath) python3.2 $(tests)
 
-# TODO: support 3.x
-#test/32:
-	#$(pypath) python3.2 $(nose) $(test_opts) $(tests)
+test/33:
+	$(pypath) python3.3 $(tests)
 
-#test/33:
-	#$(pypath) python3.3 $(nose) $(test_opts) $(tests)
+int:
+	$(pypath) python $(test_opts) $(int)
 
 travis: setup test
 
@@ -51,5 +52,7 @@ distribute:
 build/coverage:
 	pip install coverage -t $(target) -b $(source)
 
-.PHONY: init clean test coverage test/help test/32 test/33
+build/nose:
+	pip install nose -t $(target) -b $(source)
 
+.PHONY: init clean test coverage test/help test/32 test/33

requirements.txt

@@ -1,5 +1,4 @@
 requests
 requests_oauthlib
 certifi
-nose
 mock

test/int.py

@@ -47,3 +47,5 @@ def test_purge(self):
         self.assertEqual(200, self.max.purge(zone, popularfiles[0]["uri"])["code"])
         self.assertEqual(200, self.max.purge(zone, [ popularfiles[0]["uri"], popularfiles[1]["uri"]])["code"])
 
+if __name__ == '__main__':
+        unittest.main()

test/test.py

@@ -100,3 +100,5 @@ def test_purge(self):
         self.assertEqual(self.maxcdn.purge(12345, ["/master.css", "/other.css"]),
                 { "code": 200, "method": "delete", "data": { "foo":"bar" } })
 
+if __name__ == '__main__':
+        unittest.main()