diff --git a/dev/.buildinfo b/dev/.buildinfo index d40fdce7..3bac78ad 100644 --- a/dev/.buildinfo +++ b/dev/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 9e88068194cab21ac08d9626ae99d1eb +config: c34c7b21d7652bf4b64e9eb542072277 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/dev/.doctrees/developer_guide.doctree b/dev/.doctrees/developer_guide.doctree index 3ccb6b4b..285e976a 100644 Binary files a/dev/.doctrees/developer_guide.doctree and b/dev/.doctrees/developer_guide.doctree differ diff --git a/dev/.doctrees/environment.pickle b/dev/.doctrees/environment.pickle index c91449cc..0ae2b4ac 100644 Binary files a/dev/.doctrees/environment.pickle and b/dev/.doctrees/environment.pickle differ diff --git a/dev/.doctrees/index.doctree b/dev/.doctrees/index.doctree index 1a479439..ce0bf603 100644 Binary files a/dev/.doctrees/index.doctree and b/dev/.doctrees/index.doctree differ diff --git a/dev/_modules/geouned/GEOReverse/core.html b/dev/_modules/geouned/GEOReverse/core.html index ff2bbc36..9bea34e3 100644 --- a/dev/_modules/geouned/GEOReverse/core.html +++ b/dev/_modules/geouned/GEOReverse/core.html @@ -7,7 +7,7 @@
-Tests checking the code will run automatically on the pull request.
If the tests pass and at least one approver approves then the pull request can be merged.
-When a pull request is ready to be merged then the pull request should be squashed and merged into the dev branch.
+When updating the dev branch from a feature branch then a pull request is should be merged in with the squashed and merged* option.
+When updating the main branch from the dev branch then the pull request should be merged in with the create a merge commit option.
+ +GEOUNED will use Semantic Versioning to number releases of the tool, in the form “Major.Minor.Patch”, e.g., “3.15.9”.
Then create a pull request from dev branch to main branch
-Once the tests for this pass then merge the pull request in. Do not squash this pull request as we want to keep the history of the version changes.
+Once the tests for this pass then merge the pull request in. Use the create a merge commit option when merging this pull request from dev to main.
Then create a new release on the main branch with the version number and a description of the changes.
Create a new tag with the version number (e.g. 1.2.3) and the release name (e.g. v1.2.3) and the release description.
Press the Generate release notes button to get the release notes from the pull request descriptions.
@@ -594,15 +599,11 @@The conda-forge package release is done after the PyPI release. This is because the conda-forge package is built from the PyPI package.
-Conda Forge has a bot thew generates a pull request to update the conda-forge recipe. This is done automatically when the PyPI package is released.
-The pull request will be generated in the conda-forge/GEOUNED-feedstock repository.
+Conda Forge has a bot that generates a pull request to update the conda-forge recipe. This is done automatically when the PyPI package is released.
+The pull request will be generated in the conda-forge/GEOUNED-feedstock repository a short while after the PyPI release.
Check the pull request and if the tests pass then merge the pull request.
A Conda Forge package will be built and released to the conda-forge channel.
-Once released the package will be visaible on the conda-forge channel.
-GEOUNED will use Semantic Versioning to number releases of the tool, in the form “Major.Minor.Patch”, e.g., “3.15.9”.
+Once released the package will be visible on the conda-forge channel.
Version: 0.1.dev1+gf7f4279
+Version: 0.1.dev1+ge242565
GEOUNED converts CAD to Constructive Solid Geometry (CSG) formats for use in Monte Carlo transport codes. Supported codes include OpenMC, PHITS, Serpent and MCNP.
@@ -446,9 +446,9 @@