From 6742df470ffc18acf758548278e99545f1667d4d Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Wed, 20 Mar 2024 21:26:03 +0000 Subject: [PATCH 1/4] updated versions --- pyproject.toml | 11 ++++++----- src/openmc_plot/app.py | 4 +--- .../pages/1_\360\237\226\274_Geometry_plot.py" | 16 ++-------------- .../2_\360\237\247\212_Regular_mesh_plot.py" | 4 ++-- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c10bf77..59ca49b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,12 +23,12 @@ classifiers = [ ] dependencies = [ "streamlit", - "openmc_source_plotter>=0.6.2", + "openmc_source_plotter>=0.7.0", "dagmc_geometry_slice_plotter>=0.3.1", - "openmc_geometry_plot>=0.3.5", - "regular_mesh_plotter>=0.5.3", - "openmc_depletion_plotter>=0.3.1", - "openmc_cylindrical_mesh_plotter>=0.1.2", + "openmc_geometry_plot>=0.4.2", + "openmc_regular_mesh_plotter>=1.2.1", + "openmc_depletion_plotter>=0.4.0", + "openmc_cylindrical_mesh_plotter>=0.3.2", ] dynamic = ["version"] @@ -52,3 +52,4 @@ package-dir = {"" = "src"} [project.scripts] openmc_plot = "openmc_plot.launch:main" +openmc-plot = "openmc_plot.launch:main" diff --git a/src/openmc_plot/app.py b/src/openmc_plot/app.py index 78b33ed..444c8c5 100644 --- a/src/openmc_plot/app.py +++ b/src/openmc_plot/app.py @@ -30,7 +30,7 @@ """ st.markdown(hide_streamlit_style, unsafe_allow_html=True) -version = "v0.3.0" +version = "v0.3.1" location = os.getenv("OPENMC_PLOT_LOCATION") if location == "cloud": @@ -44,10 +44,8 @@ ### 🐍 Install with Python ```pip install openmc_plot``` then run with ```openmc_plot``` - 💾 Raise a feature request, report and issue or make a contribution on [GitHub](https://github.com/fusion-energy/openmc_plot) - 📧 Email feedback to mail@jshimwell.com """ ) else: diff --git "a/src/openmc_plot/pages/1_\360\237\226\274_Geometry_plot.py" "b/src/openmc_plot/pages/1_\360\237\226\274_Geometry_plot.py" index 3d45f53..c2b1d3c 100644 --- "a/src/openmc_plot/pages/1_\360\237\226\274_Geometry_plot.py" +++ "b/src/openmc_plot/pages/1_\360\237\226\274_Geometry_plot.py" @@ -1,21 +1,9 @@ -import xml.etree.ElementTree as ET -from pathlib import Path -import plotly.graph_objects as go -import matplotlib.pyplot as plt -import openmc import streamlit as st -from matplotlib import colors -from pylab import cm, colormaps -import numpy as np - -import openmc_geometry_plot # adds extra functions to openmc.Geometry - -from utils import save_uploadedfile - +import openmc_geometry_plot def header(): st.write( - f"""This tab makes use of the 🐍 Python package ```openmc_geometry_plot v{openmc_geometry_plot.__version__}``` which is available on [GitHub](https://github.com/fusion-energy/openmc_geometry_plot).""" + f"""This tab makes use of the 🐍 Python package ```openmc_geometry_plot v{openmc_geometry_plot.__version__}``` which is available separately on [GitHub](https://github.com/fusion-energy/openmc_geometry_plot).""" ) header() diff --git "a/src/openmc_plot/pages/2_\360\237\247\212_Regular_mesh_plot.py" "b/src/openmc_plot/pages/2_\360\237\247\212_Regular_mesh_plot.py" index a6d7fa9..d2e92d3 100644 --- "a/src/openmc_plot/pages/2_\360\237\247\212_Regular_mesh_plot.py" +++ "b/src/openmc_plot/pages/2_\360\237\247\212_Regular_mesh_plot.py" @@ -7,13 +7,13 @@ from matplotlib.colors import LogNorm import plotly.graph_objects as go import numpy as np -import regular_mesh_plotter +import openmc_regular_mesh_plotter import xml.etree.ElementTree as ET st.write( f""" - This tab makes use of the 🐍 Python package ```regular_mesh_plotter v{regular_mesh_plotter.__version__}``` which is available on [GitHub](https://github.com/fusion-energy/regular_mesh_plotter). + This tab makes use of the 🐍 Python package ```openmc_regular_mesh_plotter v{openmc_regular_mesh_plotter.__version__}``` which is available on [GitHub](https://github.com/fusion-energy/regular_mesh_plotter). """ ) From 0cd131e394056f1c57852b454ffc90ab5bffb756 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Wed, 20 Mar 2024 22:39:14 +0000 Subject: [PATCH 2/4] [skip ci] version 0.3.3 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 59ca49b..986667d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "openmc_geometry_plot>=0.4.2", "openmc_regular_mesh_plotter>=1.2.1", "openmc_depletion_plotter>=0.4.0", - "openmc_cylindrical_mesh_plotter>=0.3.2", + "openmc_cylindrical_mesh_plotter>=0.3.3", ] dynamic = ["version"] From 1583646fd067c40da0e8bfb4992b279479b95397 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Wed, 20 Mar 2024 22:41:59 +0000 Subject: [PATCH 3/4] streamlite --- pyproject.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 59ca49b..71ab487 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,13 +22,12 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "streamlit", + "openmc_geometry_plot>=0.4.2", "openmc_source_plotter>=0.7.0", "dagmc_geometry_slice_plotter>=0.3.1", - "openmc_geometry_plot>=0.4.2", "openmc_regular_mesh_plotter>=1.2.1", "openmc_depletion_plotter>=0.4.0", - "openmc_cylindrical_mesh_plotter>=0.3.2", + "openmc_cylindrical_mesh_plotter>=0.3.3", ] dynamic = ["version"] From 2c1e4a9107d59a28385404a22de834c09984d49b Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Thu, 9 May 2024 11:13:31 +0100 Subject: [PATCH 4/4] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 71ab487..0d6e555 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "openmc_geometry_plot>=0.4.2", + "openmc_geometry_plot>=0.4.3", "openmc_source_plotter>=0.7.0", "dagmc_geometry_slice_plotter>=0.3.1", "openmc_regular_mesh_plotter>=1.2.1",