9.0 Deployment (#191)

Author: michaelhoehn

Python_Engine/Python/Dockerfile

@@ -0,0 +1,7 @@
+FROM python:3.10-slim
+
+COPY . /Python_Toolkit
+
+RUN pip3 install ./Python_Toolkit
+
+RUN rm ./Python_Toolkit -rf

Python_Engine/Python/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 source = "https://github.com/BHoM/Python_Toolkit"
 
 [build-system]
-requires = ["setuptools", "pywin32"]
+requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [dependency-groups]
@@ -46,5 +46,8 @@ package-dir = {"" = "src"}
 where = ["src"]
 exclude = ["tests"]
 
+[tool.setuptools.package-data]
+"*" = ["*.mplstyle"]
+
 [tool.pytest.ini_options]
 pythonpath = "src"

Python_Engine/Python/setup.py

@@ -1,20 +1,17 @@
 from pathlib import Path
-
 import setuptools
-from win32api import HIWORD, LOWORD, GetFileVersionInfo
 
 TOOLKIT_NAME = "Python_Toolkit"
 
+here = Path(__file__).parent.resolve()
+
 def _bhom_version() -> str:
     """Return the version of BHoM installed (using the BHoM.dll in the root BHoM directory."""
-    info = GetFileVersionInfo("C:/ProgramData/BHoM/Assemblies/BHoM.dll", "\\")  # pylint: disable=[no-name-in-module]
-    ms = info["FileVersionMS"]
-    ls = info["FileVersionLS"]
-    return f"{HIWORD(ms)}.{LOWORD(ms)}.{HIWORD(ls)}.{LOWORD(ls)}"  # pylint: disable=[no-name-in-module]
+    versionFile = here / "VERSION.txt" #version file is created in a pre-build event in Python_Engine.csproj
+    return versionFile.read_text();
 
 BHOM_VERSION = _bhom_version()
 
-here = Path(__file__).parent.resolve()
 long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setuptools.setup(

Python_Engine/Python/src/python_toolkit/bhom/__init__.py

@@ -2,22 +2,13 @@
 
 from pathlib import Path  # pylint: disable=E0401
 from os import path
+import tempfile
+import importlib.metadata
 
-from win32api import HIWORD, LOWORD, GetFileVersionInfo
-
-BHOM_ASSEMBLIES_DIRECTORY = Path(path.expandvars("%PROGRAMDATA%/BHoM/Assemblies"))
 BHOM_LOG_FOLDER = Path(path.expandvars("%PROGRAMDATA%/BHoM/Logs"))
 TOOLKIT_NAME = "Python_Toolkit"
+BHOM_VERSION = importlib.metadata.version("python_toolkit")
 
 if not BHOM_LOG_FOLDER.exists():
-    BHOM_LOG_FOLDER = Path(path.expandvars("%TEMP%/BHoMLogs"))
-    BHOM_LOG_FOLDER.mkdir(exist_ok=True)
-
-if not BHOM_ASSEMBLIES_DIRECTORY.exists():
-    BHOM_VERSION = ""
-else:
-    _file_version_ms = GetFileVersionInfo(
-        (BHOM_ASSEMBLIES_DIRECTORY / "BHoM.dll").as_posix(), "\\"
-    )["FileVersionMS"]
-
-    BHOM_VERSION = f"{HIWORD(_file_version_ms)}.{LOWORD(_file_version_ms)}"
+    BHOM_LOG_FOLDER = Path(tempfile.gettempdir()) / "BHoM" / "Logs"
+    BHOM_LOG_FOLDER.mkdir(exist_ok=True, parents=True)

Python_Engine/Python_Engine.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyVersion>8.0.0.0</AssemblyVersion>
+    <AssemblyVersion>9.0.0.0</AssemblyVersion>
     <Description>https://github.com/BHoM/Python_Toolkit</Description>
     <Version>6.0.0</Version>
     <Authors>BHoM</Authors>
     <Copyright>Copyright © https://github.com/BHoM</Copyright>
     <RootNamespace>BH.Engine.Python</RootNamespace>
-    <FileVersion>8.3.0.0</FileVersion>
+    <FileVersion>9.0.0.0</FileVersion>
     <OutputPath>..\Build\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
@@ -39,6 +39,6 @@
     <Exec Command="xcopy $(TargetDir)$(TargetFileName) $(ProgramData)\BHoM\Assemblies /Y" />
   </Target>
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="if not exist $(ProgramData)\BHoM\Extensions\PythonEnvironments mkdir $(ProgramData)\BHoM\Extensions\PythonEnvironments&#xD;&#xA;if not exist $(ProgramData)\BHoM\Extensions\PythonCode mkdir $(ProgramData)\BHoM\Extensions\PythonCode&#xD;&#xA;      &#xD;&#xA;if exist $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName) rmdir $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName) /S /Q&#xD;&#xA;mkdir $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName)&#xD;&#xA;      &#xD;&#xA;robocopy $(ProjectDir)Python $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName) /mir /xf &quot;*.pyc&quot; &quot;*.ipynb&quot; /xd &quot;__*__&quot; &quot;.*&quot; &gt; output.log&#xD;&#xA;del output.log" />
+    <Exec Command="if not exist $(ProgramData)\BHoM\Extensions\PythonEnvironments mkdir $(ProgramData)\BHoM\Extensions\PythonEnvironments&#xD;&#xA;if not exist $(ProgramData)\BHoM\Extensions\PythonCode mkdir $(ProgramData)\BHoM\Extensions\PythonCode&#xD;&#xA;      &#xD;&#xA;if exist $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName) rmdir $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName) /S /Q&#xD;&#xA;mkdir $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName)&#xD;&#xA;      &#xD;&#xA;robocopy $(ProjectDir)Python $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName) /mir /xf &quot;*.pyc&quot; &quot;*.ipynb&quot; /xd &quot;__*__&quot; &quot;.*&quot; &gt; output.log&#xD;&#xA;del output.log&#xD;&#xA;echo $(FileVersion) > $(ProgramData)\BHoM\Extensions\PythonCode\$(SolutionName)\VERSION.txt" />
   </Target>
 </Project>

Python_oM/Python_oM.csproj

@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyVersion>8.0.0.0</AssemblyVersion>
+    <AssemblyVersion>9.0.0.0</AssemblyVersion>
     <Description>https://github.com/BHoM/Python_Toolkit</Description>
     <Version>6.0.0</Version>
     <Authors>BHoM</Authors>
     <Copyright>Copyright © https://github.com/BHoM</Copyright>
     <RootNamespace>BH.oM.Python</RootNamespace>
-    <FileVersion>8.3.0.0</FileVersion>
+    <FileVersion>9.0.0.0</FileVersion>
     <OutputPath>..\Build\</OutputPath>
   </PropertyGroup>