← Back to team overview

gtg team mailing list archive

[Merge] lp:~qcxhome/gtg/makefile-macro into lp:gtg

 

Chenxiong Qi has proposed merging lp:~qcxhome/gtg/makefile-macro into lp:gtg.

Requested reviews:
  Gtg developers (gtg)
Related bugs:
  Bug #1275226 in Getting Things GNOME!: "Port `make lint` to Python 3"
  https://bugs.launchpad.net/gtg/+bug/1275226

For more details, see:
https://code.launchpad.net/~qcxhome/gtg/makefile-macro/+merge/204379

This change does not change the default behavior of `make lint`. However, developers can specify their lint-related commands, whichever Python version they are using, both 2.x and 3.x is okay. Just issuing `make lint PEP8=python3-pep8 PYFLAKES=python3-pyflakes` for Python 3, and only `make lint` to do what it does before.
-- 
https://code.launchpad.net/~qcxhome/gtg/makefile-macro/+merge/204379
Your team Gtg developers is requested to review the proposed merge of lp:~qcxhome/gtg/makefile-macro into lp:gtg.
=== modified file 'Makefile'
--- Makefile	2013-11-23 14:40:23 +0000
+++ Makefile	2014-02-01 15:07:31 +0000
@@ -16,6 +16,9 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
+PEP8=pep8
+PYFLAKES=pyflakes
+PYDOCTOR=pydoctor
 
 check: tests pep8 pyflakes
 
@@ -33,21 +36,21 @@
 
 # Check for common & easily catchable Python mistakes.
 pyflakes:
-	pyflakes gtg gtcli gtg_new_task GTG
+	$(PYFLAKES) gtg gtcli gtg_new_task GTG
 
 # Check for coding standard violations.
 pep8:
-	pep8 --statistics --count gtg gtcli gtg_new_task GTG
+	$(PEP8) --statistics --count gtg gtcli gtg_new_task GTG
 
 # Build API documentation.
 apidocs:
-	pydoctor --add-package GTG --make-html --html-output=doc/api \
+	$(PYDOCTOR) --add-package GTG --make-html --html-output=doc/api \
 		--project-name=GTG --project-url=http://gtg.fritalk.com/
 
 edit-apidocs:
-	pydoctor --add-package GTG --make-html --html-output=doc/api \
+	$(PYDOCTOR) --add-package GTG --make-html --html-output=doc/api \
 		--project-name=GTG --project-url=http://gtg.fritalk.com/ \
-	        --verbose-about=epydoc2stan2 --verbose-about=epydoc2stan2 \
+		--verbose-about=epydoc2stan2 --verbose-about=epydoc2stan2 \
 		--verbose-about=server --verbose-about=server --local-only \
 		--server --edit
 


Follow ups