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.

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

Python toolkit #142 python environment refactor #253

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions LadybugTools_Engine/Compute/InstallPythonEnv_LBT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public static PythonEnvironment InstallPythonEnv_LBT(bool run = false, bool rein
PythonEnvironment env = Python.Compute.VirtualEnvironment(version: pythonVersion, name: Query.ToolkitName(), reload: false);

// install local package
env.InstallPackageLocal(Path.Combine(Python.Query.DirectoryCode(), Python.Query.ToolkitName()));
env.InstallPackageLocal(Path.Combine(Python.Query.DirectoryCode(), Query.ToolkitName()));

// create requirements from referenced executable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
os.environ["HOME"] = (Path("C:/Users/") / getpass.getuser()).as_posix()

# set plotting style for modules within this toolkit
plt.style.use(Path(__file__).parent / "bhom" / "bhom.mplstyle")
plt.style.use(Path("C:/ProgramData/BHoM/Extensions/PythonCode/Python_Toolkit/src/python_toolkit/bhom/bhom.mplstyle"))

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/util.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from matplotlib.legend import Legend
import matplotlib.ticker as mticker

from ..bhom.analytics import bhom_analytics
from python_toolkit.bhom.analytics import bhom_analytics
from ..helpers import rolling_window, validate_timeseries
from ..plot.utilities import contrasting_color
from ..plot._heatmap import heatmap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from ladybug_comfort.collection.utci import UTCI
from matplotlib.figure import Figure

from ..bhom.logging import CONSOLE_LOGGER
from python_toolkit.bhom.logging import CONSOLE_LOGGER
from ..bhom.to_bhom import hourlycontinuouscollection_to_bhom
from ..categorical.categories import UTCI_DEFAULT_CATEGORIES, Categorical
from ..helpers import convert_keys_to_snake_case
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from mpl_toolkits import mplot3d


from ..bhom.analytics import bhom_analytics
from python_toolkit.bhom.analytics import bhom_analytics
from ..bhom.to_bhom import point3d_to_bhom
from ..ladybug_extension.epw import sun_position_list
from ..helpers import convert_keys_to_snake_case
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from ladybug.futil import nukedir
from ladybug_comfort.collection.solarcal import OutdoorSolarCal, SolarCalParameter

from ..bhom.logging import CONSOLE_LOGGER
from python_toolkit.bhom.logging import CONSOLE_LOGGER
from ..bhom.to_bhom import (
hourlycontinuouscollection_to_bhom,
material_to_bhom,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import pandas as pd
from ladybug.epw import EPW, HourlyContinuousCollection

from ..bhom.analytics import bhom_analytics
from python_toolkit.bhom.analytics import bhom_analytics
from ..helpers import (
convert_keys_to_snake_case,
decay_rate_smoother,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import numpy as np

from ..bhom.analytics import bhom_analytics
from python_toolkit.bhom.analytics import bhom_analytics
from ._externalcomfortbase import ExternalComfort
from ._shelterbase import Shelter
from ._typologybase import Typology
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import pandas as pd
from tqdm import tqdm

from ..bhom.analytics import bhom_analytics
from python_toolkit.bhom.analytics import bhom_analytics
from ..helpers import evaporative_cooling_effect
from ..ladybug_extension.epw import AnalysisPeriod, collection_to_series
from ._simulatebase import SimulationResult
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from matplotlib.tri.triangulation import Triangulation
from mpl_toolkits.axes_grid1 import make_axes_locatable

from ...bhom.logging import CONSOLE_LOGGER
from python_toolkit.bhom.logging import CONSOLE_LOGGER
from ...ladybug_extension.analysisperiod import describe_analysis_period
from ...plot.utilities import create_triangulation
from .spatial_comfort import SpatialComfort, SpatialMetric
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from matplotlib.ticker import PercentFormatter, StrMethodFormatter
from mpl_toolkits.axes_grid1 import make_axes_locatable

from ...bhom.logging import CONSOLE_LOGGER
from python_toolkit.bhom.logging import CONSOLE_LOGGER
from ...helpers import sanitise_string, wind_speed_at_height
from ...honeybee_extension.results import (load_ill, load_pts, load_res,
make_annual)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import numpy as np

from ..bhom.analytics import bhom_analytics
from python_toolkit.bhom.analytics import bhom_analytics
from ._typologybase import Typology
from ._shelterbase import Shelter

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from scipy.interpolate import interp1d, interp2d
from tqdm import tqdm

from ..bhom.analytics import bhom_analytics
from python_toolkit.bhom.analytics import bhom_analytics
from ..categorical.categories import UTCI_DEFAULT_CATEGORIES, CategoricalComfort
from ..helpers import evaporative_cooling_effect, month_hour_binned_series
from ..ladybug_extension.datacollection import (
Expand Down
Loading