fixups

Makefile

@@ -103,73 +103,3 @@ alltest: modules lint test
 shorttest: modules lint
 	@echo "    Running short regression tests"
 	@python -m pytest --short tests/firedrake $(PYTEST_ARGS)
-
-# PyOP2 Makefile
-# PYTEST = py.test
-#
-# TEST_BASE_DIR = test
-#
-# UNIT_TEST_DIR = $(TEST_BASE_DIR)/unit
-#
-# SPHINX_DIR = doc/sphinx
-# SPHINX_BUILD_DIR = $(SPHINX_DIR)/build
-# SPHINX_TARGET = html
-# SPHINX_TARGET_DIR = $(SPHINX_BUILD_DIR)/$(SPHINX_TARGET)
-# SPHINXOPTS = -a
-#
-# PORT = 8000
-#
-# MESHES_DIR = demo/meshes
-#
-# GIT_REV = $(shell git rev-parse --verify --short HEAD)
-#
-# all: ext
-#
-# .PHONY : help test lint unit doc update_docs ext ext_clean meshes
-#
-# help:
-# 	@echo "make COMMAND with COMMAND one of:"
-# 	@echo "  test               : run lint and unit tests"
-# 	@echo "  lint               : run flake8 code linter"
-# 	@echo "  unit               : run unit tests"
-# 	@echo "  unit_BACKEND       : run unit tests for BACKEND"
-# 	@echo "  doc                : build sphinx documentation"
-# 	@echo "  serve              : launch local web server to serve up documentation"
-# 	@echo "  update_docs        : build sphinx documentation and push to GitHub"
-# 	@echo "  ext                : rebuild Cython extension"
-# 	@echo "  ext_clean          : delete generated extension"
-# 	@echo "  meshes             : download demo meshes"
-# 	@echo
-# 	@echo "Available OpenCL contexts: $(OPENCL_CTXS)"
-#
-# test: lint unit
-#
-# lint:
-# 	@flake8
-#
-# unit:
-# 	cd $(TEST_BASE_DIR); $(PYTEST) unit
-#
-# doc:
-# 	make -C $(SPHINX_DIR) $(SPHINX_TARGET) SPHINXOPTS=$(SPHINXOPTS)
-#
-# serve:
-# 	make -C $(SPHINX_DIR) livehtml
-#
-# update_docs:
-# 	if [ ! -d $(SPHINX_TARGET_DIR)/.git ]; then \
-# 	mkdir -p $(SPHINX_BUILD_DIR); \
-# 	cd $(SPHINX_BUILD_DIR); git clone `git config --get remote.origin.url` $(SPHINX_TARGET); \
-# fi
-# 	cd $(SPHINX_TARGET_DIR); git fetch -p; git checkout -f gh-pages; git reset --hard origin/gh-pages
-# 	make -C $(SPHINX_DIR) $(SPHINX_TARGET) SPHINXOPTS=$(SPHINXOPTS)
-# 	cd $(SPHINX_TARGET_DIR); git add .; git commit -am "Update documentation to revision $(GIT_REV)"; git push origin gh-pages
-#
-# ext: ext_clean
-# 	python setup.py build_ext -i
-#
-# ext_clean:
-# 	rm -rf build pyop2/compute_ind.c pyop2/compute_ind.so pyop2/sparsity.c pyop2/sparsity.so
-#
-# meshes:
-# 	make -C $(MESHES_DIR) meshes

firedrake/cython/petschdr.pxi

@@ -5,13 +5,6 @@ cimport numpy as np
 cdef extern from "mpi-compat.h":
     pass
 
-# JBTODO: Check if this _does_ work with complex. code used to be:
-#~ IF COMPLEX:
-#~     ctypedef np.complex128_t PetscScalar
-#~ ELSE:
-#~     ctypedef double PetscScalar
-# from petsc4py.PETSc import IntType, RealType, ScalarType
-
 cdef extern from "petsc.h":
     ctypedef long PetscInt
     ctypedef double PetscReal

firedrake/scripts/firedrake-install

@@ -1852,8 +1852,7 @@ if mode == "install":
             sys.path.append(os.getcwd() + "/" + p)
 
     with pipargs("--no-deps"), environment(**compiler_env, **link_env):
-        for p in ("firedrake", ):
-            install(p+"/")
+        install("firedrake/")
 
     # Work around easy-install.pth bug.
     try:
@@ -2021,8 +2020,7 @@ Please consider updating your PETSc manually.
                 install(p+"/")
 
         with pipargs("--no-deps"), environment(**compiler_env, **link_env):
-            for p in ("firedrake", ):
-                install(p+"/")
+            install("firedrake/")
 
         # Ensure pytest is at the latest version
         run_pip(["install", "-U", "pytest"])

firedrake/supermeshing.py

@@ -26,7 +26,7 @@
 __all__ = ["assemble_mixed_mass_matrix", "intersection_finder"]
 
 
-# JBTODO: This _really_ needs adding to the libsupermesh python package
+# TODO: This _really_ needs adding to the libsupermesh python package
 @cache
 def supermesh_location():
     try: