From 72818188745c431fcd0530228b86e82073bb1775 Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Tue, 28 Jan 2020 16:23:43 -0500 Subject: [PATCH 01/11] Fix display of "broken" PyTrilinos --- documentation/USAGE.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/documentation/USAGE.rst b/documentation/USAGE.rst index d131a89ca1..514c7b8161 100644 --- a/documentation/USAGE.rst +++ b/documentation/USAGE.rst @@ -358,11 +358,11 @@ that there is either a problem importing one of the required packages or that there is some problem with the :term:`MPI` environment. For example:: mpi4py PyTrilinos petsc4py FiPy - processor 0 of 3 :: processor 0 of 3 :: processor 0 of 3 :: 10 cells on processor 0 of 1 + processor 0 of 3 :: processor 0 of 1 :: processor 0 of 3 :: 10 cells on processor 0 of 1 [my.machine.com:69815] WARNING: There were 4 Windows created but not freed. - processor 1 of 3 :: processor 1 of 3 :: processor 1 of 3 :: 10 cells on processor 0 of 1 + processor 1 of 3 :: processor 0 of 1 :: processor 1 of 3 :: 10 cells on processor 0 of 1 [my.machine.com:69814] WARNING: There were 4 Windows created but not freed. - processor 2 of 3 :: processor 2 of 3 :: processor 2 of 3 :: 10 cells on processor 0 of 1 + processor 2 of 3 :: processor 0 of 1 :: processor 2 of 3 :: 10 cells on processor 0 of 1 [my.machine.com:69813] WARNING: There were 4 Windows created but not freed. indicates :term:`mpi4py` is properly communicating with :term:`MPI` and is running @@ -371,8 +371,9 @@ serial environments. As a result, :term:`FiPy` is limited to three separate serial operations, too. In this instance, the problem is that although :ref:`TRILINOS` was compiled with :term:`MPI` enabled, it was compiled against a different :term:`MPI` library than is currently available (and which :term:`mpi4py` -was compiled against). The solution is to rebuild :ref:`TRILINOS` against -the active :term:`MPI` libraries. +was compiled against). The solution, in this instance, is to solve with +:ref:`PETSC` or to rebuild :ref:`TRILINOS` against the active :term:`MPI` +libraries. When solving in parallel, :term:`FiPy` essentially breaks the problem up into separate sub-domains and solves them (somewhat) independently. From c66ca6094d6cb9e3b3f846202b264a4c947450c4 Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Tue, 28 Jan 2020 16:25:15 -0500 Subject: [PATCH 02/11] Build PDF on Py3k --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6b1233ec92..0ae306e2dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -465,9 +465,6 @@ jobs: - build_html_docs: condaenv: << parameters.condaenv >> - - build_pdf_docs: - condaenv: << parameters.condaenv >> - build-36-docs: <<: *defaults3 @@ -501,6 +498,9 @@ jobs: - build_html_docs: condaenv: << parameters.condaenv >> + - build_pdf_docs: + condaenv: << parameters.condaenv >> + build-binaries: <<: *defaults3 From a9a1a950acc77fe16ae89840a729656f0e4d0cfa Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Tue, 28 Jan 2020 16:23:43 -0500 Subject: [PATCH 03/11] Fix display of "broken" PyTrilinos --- documentation/USAGE.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/documentation/USAGE.rst b/documentation/USAGE.rst index d131a89ca1..514c7b8161 100644 --- a/documentation/USAGE.rst +++ b/documentation/USAGE.rst @@ -358,11 +358,11 @@ that there is either a problem importing one of the required packages or that there is some problem with the :term:`MPI` environment. For example:: mpi4py PyTrilinos petsc4py FiPy - processor 0 of 3 :: processor 0 of 3 :: processor 0 of 3 :: 10 cells on processor 0 of 1 + processor 0 of 3 :: processor 0 of 1 :: processor 0 of 3 :: 10 cells on processor 0 of 1 [my.machine.com:69815] WARNING: There were 4 Windows created but not freed. - processor 1 of 3 :: processor 1 of 3 :: processor 1 of 3 :: 10 cells on processor 0 of 1 + processor 1 of 3 :: processor 0 of 1 :: processor 1 of 3 :: 10 cells on processor 0 of 1 [my.machine.com:69814] WARNING: There were 4 Windows created but not freed. - processor 2 of 3 :: processor 2 of 3 :: processor 2 of 3 :: 10 cells on processor 0 of 1 + processor 2 of 3 :: processor 0 of 1 :: processor 2 of 3 :: 10 cells on processor 0 of 1 [my.machine.com:69813] WARNING: There were 4 Windows created but not freed. indicates :term:`mpi4py` is properly communicating with :term:`MPI` and is running @@ -371,8 +371,9 @@ serial environments. As a result, :term:`FiPy` is limited to three separate serial operations, too. In this instance, the problem is that although :ref:`TRILINOS` was compiled with :term:`MPI` enabled, it was compiled against a different :term:`MPI` library than is currently available (and which :term:`mpi4py` -was compiled against). The solution is to rebuild :ref:`TRILINOS` against -the active :term:`MPI` libraries. +was compiled against). The solution, in this instance, is to solve with +:ref:`PETSC` or to rebuild :ref:`TRILINOS` against the active :term:`MPI` +libraries. When solving in parallel, :term:`FiPy` essentially breaks the problem up into separate sub-domains and solves them (somewhat) independently. From 9d4a6e453ae56ecfa09d00944a88eaaf5e3a0ef4 Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Tue, 28 Jan 2020 16:25:15 -0500 Subject: [PATCH 04/11] Build PDF on Py3k --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6b1233ec92..0ae306e2dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -465,9 +465,6 @@ jobs: - build_html_docs: condaenv: << parameters.condaenv >> - - build_pdf_docs: - condaenv: << parameters.condaenv >> - build-36-docs: <<: *defaults3 @@ -501,6 +498,9 @@ jobs: - build_html_docs: condaenv: << parameters.condaenv >> + - build_pdf_docs: + condaenv: << parameters.condaenv >> + build-binaries: <<: *defaults3 From c8c412a2ceb5d28b94734421bc5aef8fa9952f62 Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Thu, 13 Feb 2020 16:56:02 -0500 Subject: [PATCH 05/11] Tarball the html docs --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ae306e2dd..4c6b821bb3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,9 +104,10 @@ commands: source activate ~/project/<< parameters.condaenv >> export ETS_TOOLKIT=null python setup.py build_docs --html + tar -czf ~/project/documentation/_build/html.tar.gz ~/project/documentation/_build/html - store_artifacts: - path: ~/project/documentation/_build/html + path: ~/project/documentation/_build/ build_pdf_docs: description: "Build PDF Docs" From 06f52b3da31202f345e08787f63cd716b8b4897f Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Thu, 13 Feb 2020 17:38:57 -0500 Subject: [PATCH 06/11] Strip leading directories from tarball --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4c6b821bb3..ba6c9a9e47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,7 +104,7 @@ commands: source activate ~/project/<< parameters.condaenv >> export ETS_TOOLKIT=null python setup.py build_docs --html - tar -czf ~/project/documentation/_build/html.tar.gz ~/project/documentation/_build/html + tar -czf ~/project/documentation/_build/html.tar.gz -C ~/project/ . - store_artifacts: path: ~/project/documentation/_build/ From e0b19df18b937506b08c2cf327d893d292a14ddd Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Thu, 13 Feb 2020 18:56:36 -0500 Subject: [PATCH 07/11] Don't tar the tarball into itself --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba6c9a9e47..e4d4fffc8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,10 +104,10 @@ commands: source activate ~/project/<< parameters.condaenv >> export ETS_TOOLKIT=null python setup.py build_docs --html - tar -czf ~/project/documentation/_build/html.tar.gz -C ~/project/ . + tar -czf ~/project/html.tar.gz -C ~/project/ . - store_artifacts: - path: ~/project/documentation/_build/ + path: ~/project/html.tar.gz build_pdf_docs: description: "Build PDF Docs" From 0281ef6708f12d7736f348880afbcb3e711e1686 Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Thu, 13 Feb 2020 19:09:01 -0500 Subject: [PATCH 08/11] Tar documentation only --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e4d4fffc8a..802dda3368 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,7 +104,7 @@ commands: source activate ~/project/<< parameters.condaenv >> export ETS_TOOLKIT=null python setup.py build_docs --html - tar -czf ~/project/html.tar.gz -C ~/project/ . + tar -czf ~/project/html.tar.gz -C ~/project/ documentation - store_artifacts: path: ~/project/html.tar.gz From efda99ad5b006a1d01c8f9330e2fabab347d0f76 Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Thu, 13 Feb 2020 22:08:33 -0500 Subject: [PATCH 09/11] Fiddling with what artifacts to store for html docs --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 802dda3368..fd47e20215 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,11 +104,14 @@ commands: source activate ~/project/<< parameters.condaenv >> export ETS_TOOLKIT=null python setup.py build_docs --html - tar -czf ~/project/html.tar.gz -C ~/project/ documentation + tar -czf ~/project/html.tar.gz -C ~/project/documentation/_build html - store_artifacts: path: ~/project/html.tar.gz + - store_artifacts: + path: ~/project/documentation/_build/html + build_pdf_docs: description: "Build PDF Docs" From 8cb4a74eaa20fb890088a473f52c3b9ab75b96fb Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Fri, 14 Feb 2020 08:49:17 -0500 Subject: [PATCH 10/11] Revise instructions on where to get build products --- documentation/ADMINISTRATA.rst | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/documentation/ADMINISTRATA.rst b/documentation/ADMINISTRATA.rst index 000d366bd7..1a128b4b3d 100644 --- a/documentation/ADMINISTRATA.rst +++ b/documentation/ADMINISTRATA.rst @@ -214,21 +214,19 @@ the tagged build products and place in :file:`dist/`: :file:`FiPy-x.y.tar.gz` From CircleCI_ `build-binaries` Artifacts - :file:`FiPy-x.y.win32.zip` - From AppVeyor_ Artifacts - -Clean the working copy:: - - $ git clean -fd + :file:`~/project/documentation/_build/latex/fipy.pdf` + From CircleCI_ `build-36-docs` Artifacts -.. note:: + :file:`~/project/html.tar.gz` + From CircleCI_ `build-36-docs` Artifacts - Alternatively, clone into a clean repository. + :file:`FiPy-x.y.win32.zip` + From AppVeyor_ Artifacts -Build the documentation and the web pages:: +From the :file:`{FiPySource}` directory, unpack :file:`dist/html.tar.gz` +into file:`documentation/_build` with:: - $ python setup.py bdist_egg - $ python setup.py build_docs --pdf --html --cathartic + $ tar -xzf dist/html.tar.gz -C documentation/_build ------ Upload @@ -258,7 +256,13 @@ Upload the web site to CTCMS :: Update conda-forge feedstock ---------------------------- -Using a pull request, update the fipy-feedstock_ with: +Once you push the tag to GitHub_, the fipy-feedstock_ should automatically +receive a pull request. Review and amend this pull request as necessary +and ask the `feedstock maintainers`_ to merge it. + +This automated process only runs once an hour, so if you don't wish to wait +(or it doesn't trigger for some reason), you can manually generate a pull +request to update the fipy-feedstock_ with: * revised version number * revised sha256 (use ``openssl dgst -sha256 /path/to/fipy-x.y.tar.gz``) @@ -282,3 +286,4 @@ Make an announcement to `fipy@nist.gov`_ .. _twine: https://pypi.org/project/twine .. _fipy-feedstock: https://github.com/conda-forge/fipy-feedstock .. _fipy@nist.gov: mailto:fipy@nist.gov +.. _feedstock maintainers: https://github.com/conda-forge/fipy-feedstock#feedstock-maintainers From ed78ec19e2dd09ff326399a954fb688ea788a7d4 Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Fri, 14 Feb 2020 09:17:15 -0500 Subject: [PATCH 11/11] Change AppVeyor links to organization builds --- README.rst | 2 +- documentation/ADMINISTRATA.rst | 2 +- documentation/_templates/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index ba9e71effe..ab0d2ecc5f 100644 --- a/README.rst +++ b/README.rst @@ -163,7 +163,7 @@ or a .. |TravisCI| image:: https://img.shields.io/travis/usnistgov/fipy/master.svg?label=macOS .. _TravisCI: https://travis-ci.org/usnistgov/fipy .. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/usnistgov/fipy?branch=master&svg=true&failingText=Windows%20-%20failing&passingText=Windows%20-%20passing&pendingText=Windows%20-%20pending -.. _AppVeyor: https://ci.appveyor.com/project/guyer/fipy +.. _AppVeyor: https://ci.appveyor.com/project/usnistgov/fipy .. |OpenHub| image:: https://www.openhub.net/p/fipy/widgets/project_thin_badge.gif .. _OpenHub: https://www.openhub.net/p/fipy .. |PyPI| image:: https://img.shields.io/pypi/v/fipy.svg diff --git a/documentation/ADMINISTRATA.rst b/documentation/ADMINISTRATA.rst index 1a128b4b3d..b36c791d3d 100644 --- a/documentation/ADMINISTRATA.rst +++ b/documentation/ADMINISTRATA.rst @@ -130,7 +130,7 @@ Windows builds are performed on AppVeyor_. This CI is configured in .. |TravisCI| image:: https://img.shields.io/travis/usnistgov/fipy/master.svg?label=macOS .. _TravisCI: https://travis-ci.org/usnistgov/fipy .. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/usnistgov/fipy?branch=master&svg=true&failingText=Windows%20-%20failing&passingText=Windows%20-%20passing&pendingText=Windows%20-%20pending -.. _AppVeyor: https://ci.appveyor.com/project/guyer/fipy +.. _AppVeyor: https://ci.appveyor.com/project/usnistgov/fipy .. _{FiPySource}/.circleci/config.yml: https://github.com/usnistgov/fipy/blob/master/.circleci/config.yml .. _{FiPySource}/.travis.yml: https://github.com/usnistgov/fipy/blob/master/.travis.yml diff --git a/documentation/_templates/index.html b/documentation/_templates/index.html index 0d52d8f75b..c6e5e8b1ef 100644 --- a/documentation/_templates/index.html +++ b/documentation/_templates/index.html @@ -64,7 +64,7 @@

FiPy: A Finite Volume PDE Solver Using Python

Linux status macOS status - Windows status + Windows status
GitHub PyPi