Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update main with latest dev #240

Merged
merged 29 commits into from
Jun 18, 2024
Merged

update main with latest dev #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0d16df0
added pypi version badge (#176)
shimwell May 17, 2024
abd6dab
Removing unused functions (#178)
shimwell May 17, 2024
07f018f
more concise install with conda-forge (#180)
shimwell May 20, 2024
ac30ab8
Avoid doubled underscore in method names (#181)
shimwell May 20, 2024
5d209e0
Moving decompose solids into CadToCsg class (#183)
shimwell May 21, 2024
46b6025
moving load_cad and export_solids from start to own method (#186)
shimwell May 21, 2024
7207755
Moving get universe out of start method (#188)
shimwell May 22, 2024
cafe1a7
Remove need for os import (#185)
shimwell May 22, 2024
793d4f3
corrected badge urls (#190)
shimwell May 22, 2024
d7806c0
Adding docs for json api usage (#192)
shimwell May 23, 2024
0e52196
Adding UCARD to missing parts of documentation and example JSON file …
shimwell May 23, 2024
721ed45
Adding version support to docs (#198)
shimwell May 27, 2024
2f76c1e
added missing " (#200)
shimwell May 27, 2024
ef80ed2
Adding more details to the developer documentation (#202)
shimwell May 28, 2024
1762a3a
Changing cellRange to discrete numbers to allow more flexability when…
shimwell Jun 4, 2024
58c245e
Adding y to install (#207)
shimwell Jun 4, 2024
599fe67
Fix for #203, errors in simplify full (#206)
KBGrammer Jun 4, 2024
a3fd78f
Simplify error (#211)
KBGrammer Jun 7, 2024
e093b78
fixed versions url (#217)
shimwell Jun 13, 2024
072fde4
removed config ini code (#218)
shimwell Jun 13, 2024
47d7463
added part from alex comment (#219)
shimwell Jun 13, 2024
ec9a61b
Specify in the developer guide that openmc and pytest are needed to r…
alberto743 Jun 13, 2024
08fc43b
Update reverse to JSON and rename to CsgToCad (#229)
shimwell Jun 15, 2024
b2ab4fe
Removing old config ini file based scripts (#226)
shimwell Jun 15, 2024
3353fd3
Merge branch 'main' into dev
psauvan Jun 15, 2024
f444000
closes #213; additional guidance for install (#235)
alexvalentine94 Jun 16, 2024
7791250
Update docs badge with new action name (#238)
shimwell Jun 18, 2024
1da7672
Added version 1.2 to docs versions (#236)
shimwell Jun 18, 2024
eebcfeb
Merge branch 'main' into dev
psauvan Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![CI testing](https://github.com/GEOUNED-org/GEOUNED/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/GEOUNED-org/GEOUNED/actions/workflows/ci.yml)
[![Upload Python Package](https://github.com/GEOUNED-org/GEOUNED/actions/workflows/python-publish.yml/badge.svg)](https://github.com/GEOUNED-org/GEOUNED/actions/workflows/python-publish.yml)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black)
[![documentation](https://github.com/GEOUNED-org/GEOUNED/actions/workflows/documentation.yml/badge.svg)](https://github.com/GEOUNED-org/GEOUNED/actions/workflows/documentation.yml)
[![documentation release](https://github.com/GEOUNED-org/GEOUNED/actions/workflows/documentation_release.yml/badge.svg)](https://github.com/GEOUNED-org/GEOUNED/actions/workflows/documentation_release.yml)
[![PyPI](https://img.shields.io/pypi/v/geouned?&label=PyPI)](https://pypi.org/project/geouned/)

[![Anaconda-Server Badge](https://anaconda.org/conda-forge/geouned/badges/version.svg)](https://anaconda.org/conda-forge/geouned)
Expand Down
5 changes: 5 additions & 0 deletions docs/version_switcher.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,10 @@
"name": "1.1.0",
"version": "1.1.0",
"url": "https://geouned-org.github.io/GEOUNED/1.1.0"
},
{
"name": "1.2.0",
"version": "1.2.0",
"url": "https://geouned-org.github.io/GEOUNED/1.2.0"
}
]