diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 49dac8204d..0000000000 --- a/AUTHORS +++ /dev/null @@ -1,24 +0,0 @@ -PyOP2 has received contributions from the following: - -Institutions ------------- - -Imperial College London -The University of Edinburgh - -Individuals ------------ - -Gheorghe-Teodor Bercea -Simon Funke -Ben Grabham -David A Ham -Nicolas Loriant -Fabio Luporini -Graham Markall -Lawrence Mitchell -Florian Rathgeber -Francis Russell -Kaho Sato -Reuben W. Nixon-Hill -Nacime Bouziani diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index a7b8b89c86..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,60 +0,0 @@ -# Contributing to PyOP2 - -We value third-party contributions. To keep things simple for you and us, -please adhere to the following contributing guidelines. - -## Getting Started - -* You will need a [GitHub account](https://github.com/signup/free). -* Submit a [ticket for your issue][0], assuming one does not already exist. - * Clearly describe the issue including steps to reproduce when it is a bug. - * Make sure you specify the version that you know has the issue. - * Bonus points for submitting a failing test along with the ticket. -* If you don't have push access, fork the repository on GitHub. - -## Making Changes - -* Create a topic branch for your feature or bug fix. -* Make commits of logical units. -* Make sure your commits adhere to the coding guidelines below. -* Make sure your commit messages are in the [proper format][1]: The first line - of the message should have 50 characters or less, separated by a blank line - from the (optional) body. The body should be wrapped at 70 characters and - paragraphs separated by blank lines. Bulleted lists are also fine. -* Make sure you have added the necessary tests for your changes. -* Run _all_ the tests to assure nothing else was accidentally broken. - -## Coding guidelines - -[PEP 0008][2] is enforced, with the exception of [E501][3] and [E226][3]: -* Indent by 4 spaces, tabs are *strictly forbidden*. -* Lines should not exceed 79 characters where possible without severely - impacting legibility. If breaking a line would make the code much less - readable it's fine to overrun by a little bit. -* No trailing whitespace at EOL or trailing blank lines at EOF. - -## Checking your commit conforms to coding guidelines - -Install a Git pre-commit hook automatically checking for tab and whitespace -errors before committing and also calls `flake8` on your changed files. In the -`.git/hooks` directory of your local Git repository, run the following: - -``` -git config --local core.whitespace "space-before-tab, tab-in-indent, trailing-space, tabwidth=4" -wget https://gist.github.com/kynan/d233073b66e860c41484/raw/pre-commit -chmod +x pre-commit -``` - -Make sure the `pre-commit.sample` hook is still in place, since it is required. - -## Submitting Changes - -* We can only accept your contribution if you have signed the Contributor - License Agreement (CLA). -* Push your changes to a topic branch in your fork of the repository. -* Submit a pull request to the repository in the OP2 organization. - -[0]: https://github.com/OP2/PyOP2/issues -[1]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html -[2]: http://www.python.org/dev/peps/pep-0008/ -[3]: http://pep8.readthedocs.org/en/latest/intro.html#error-codes diff --git a/Makefile b/Makefile index b824736d41..7dbd1a84f7 100644 --- a/Makefile +++ b/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 diff --git a/firedrake/cython/petschdr.pxi b/firedrake/cython/petschdr.pxi index e2cd08412e..55786e7184 100644 --- a/firedrake/cython/petschdr.pxi +++ b/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 diff --git a/firedrake/scripts/firedrake-install b/firedrake/scripts/firedrake-install index 0905de51bf..ecfb7366be 100755 --- a/firedrake/scripts/firedrake-install +++ b/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"]) diff --git a/firedrake/supermeshing.py b/firedrake/supermeshing.py index 9c02a129ce..8d6c817a9b 100644 --- a/firedrake/supermeshing.py +++ b/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: