ebm 0.99.5__tar.gz → 0.99.7__tar.gz

{ebm-0.99.5/ebm.egg-info → ebm-0.99.7}/PKG-INFO

@@ -1,20 +1,11 @@
 Metadata-Version: 2.4
 Name: ebm
-Version: 0.99.5
+Version: 0.99.7
 Summary: A project for energy usage modeling
-Author-email: Ny Forbruksmodell <ebm@nve.no>, Lars Petrusson <lfep@nve.no>, Mohammed Ettyabi <moe@nve.no>, Ketil Nordstad <kenord@nve.no>
-License: MIT
+Author-email: Lars Petrusson <lfep@nve.no>, Ketil Nordstad <kenord@nve.no>
 Project-URL: Homepage, https://www.nve.no/
 Project-URL: Documentation, https://nve.github.io/ebm-docs
-Project-URL: Repository, https://github.com/NVE/ebm.git
-Keywords: egg,bacon
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Science/Research
-Classifier: Topic :: Scientific/Engineering :: Information Analysis
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Project-URL: Repository, https://github.com/NVE/ebm
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -24,7 +15,7 @@ Requires-Dist: openpyxl
 Requires-Dist: pandas
 Requires-Dist: python-dotenv
 Requires-Dist: rich
-Requires-Dist: pandera
+Requires-Dist: pandera==0.20.4
 Requires-Dist: XlsxWriter
 Requires-Dist: pywin32; platform_system == "Windows"
 Provides-Extra: test
@@ -56,6 +47,9 @@ estimated by a bottom- up approach, based on the building stock floor area, ener
 systems. The mathematical model is implemented in Python, with input and output files in excel or csv.
 
 
+![ebm-in-windows-terminal.png](docs/source/_static/getting_started/ebm-in-windows-terminal.png)
+
+
 # Getting Started
 
 ## More information
@@ -75,12 +69,6 @@ how ti install EBM as a user.
 
 Open a terminal application and navigate to wherever you want to do work. 
 
-### Clone the github repository
-
-`git clone https://github.com/NVE/ebm`
-
-`cd ebm`
-
 ### Make a python virtual environment (optional)
 
 While optional, it is always recommended to install and run python modules in a discrete virtual environment. To create a 
@@ -105,7 +93,24 @@ To use your venv you need to activate it
 More information on [Python virtual environments](https://realpython.com/python-virtual-environments-a-primer/)
 
 
-### Install EBM
+## Install EBM
+
+There are two options. **Install from PyPI** (Python package index) or install **clone the github repository**.
+
+### Install from PyPI
+
+`python -m pip install ebm`
+
+You can now run the model as a module `python -m ebm` or as a program `ebm`
+
+Please refer to [getting started](https://nve.github.io/ebm-docs/user_guide/getting_started.html) for more information on how the model works.
+
+
+### Clone the github repository
+
+`git clone https://github.com/NVE/ebm`
+
+`cd ebm`
 
 Make sure your current working directory is the EBM root. 
 
@@ -206,7 +211,7 @@ This project is licensed under the MIT License. You are free to use, modify, and
 We welcome contributions! Please refer to the Contributing Guide (CONTRIBUTING.md) for details on how to get started.
 
 ## Documentation
-Full documentation is available at the EBM User Guide: https://nve.github.io/ebm-docs/
+Full documentation is available at the EBM User Guide: https://nve.github.io/ebm/
 
 
 

{ebm-0.99.5 → ebm-0.99.7}/README.md

@@ -7,6 +7,9 @@ estimated by a bottom- up approach, based on the building stock floor area, ener
 systems. The mathematical model is implemented in Python, with input and output files in excel or csv.
 
 
+![ebm-in-windows-terminal.png](docs/source/_static/getting_started/ebm-in-windows-terminal.png)
+
+
 # Getting Started
 
 ## More information
@@ -26,12 +29,6 @@ how ti install EBM as a user.
 
 Open a terminal application and navigate to wherever you want to do work. 
 
-### Clone the github repository
-
-`git clone https://github.com/NVE/ebm`
-
-`cd ebm`
-
 ### Make a python virtual environment (optional)
 
 While optional, it is always recommended to install and run python modules in a discrete virtual environment. To create a 
@@ -56,7 +53,24 @@ To use your venv you need to activate it
 More information on [Python virtual environments](https://realpython.com/python-virtual-environments-a-primer/)
 
 
-### Install EBM
+## Install EBM
+
+There are two options. **Install from PyPI** (Python package index) or install **clone the github repository**.
+
+### Install from PyPI
+
+`python -m pip install ebm`
+
+You can now run the model as a module `python -m ebm` or as a program `ebm`
+
+Please refer to [getting started](https://nve.github.io/ebm-docs/user_guide/getting_started.html) for more information on how the model works.
+
+
+### Clone the github repository
+
+`git clone https://github.com/NVE/ebm`
+
+`cd ebm`
 
 Make sure your current working directory is the EBM root. 
 
@@ -157,7 +171,7 @@ This project is licensed under the MIT License. You are free to use, modify, and
 We welcome contributions! Please refer to the Contributing Guide (CONTRIBUTING.md) for details on how to get started.
 
 ## Documentation
-Full documentation is available at the EBM User Guide: https://nve.github.io/ebm-docs/
+Full documentation is available at the EBM User Guide: https://nve.github.io/ebm/
 
 
 

{ebm-0.99.5 → ebm-0.99.7}/ebm/__main__.py

@@ -1,5 +1,6 @@
 """EBM start from where when running as a script or module"""
 import os
+os.environ['DISABLE_PANDERA_IMPORT_WARNING'] = 'True'
 import pathlib
 import sys
 
@@ -35,6 +36,7 @@ def main() -> tuple[ReturnCode, pd.DataFrame | None]:
 
     """
     load_environment_from_dotenv()
+
     configure_loglevel(log_format=os.environ.get('LOG_FORMAT', '{level.icon} <level>{message}</level>'))
     configure_json_log()
 

ebm-0.99.7/ebm/__version__.py

@@ -0,0 +1 @@
+version = "0.99.7"

{ebm-0.99.5 → ebm-0.99.7/ebm.egg-info}/PKG-INFO

@@ -1,20 +1,11 @@
 Metadata-Version: 2.4
 Name: ebm
-Version: 0.99.5
+Version: 0.99.7
 Summary: A project for energy usage modeling
-Author-email: Ny Forbruksmodell <ebm@nve.no>, Lars Petrusson <lfep@nve.no>, Mohammed Ettyabi <moe@nve.no>, Ketil Nordstad <kenord@nve.no>
-License: MIT
+Author-email: Lars Petrusson <lfep@nve.no>, Ketil Nordstad <kenord@nve.no>
 Project-URL: Homepage, https://www.nve.no/
 Project-URL: Documentation, https://nve.github.io/ebm-docs
-Project-URL: Repository, https://github.com/NVE/ebm.git
-Keywords: egg,bacon
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Science/Research
-Classifier: Topic :: Scientific/Engineering :: Information Analysis
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Project-URL: Repository, https://github.com/NVE/ebm
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -24,7 +15,7 @@ Requires-Dist: openpyxl
 Requires-Dist: pandas
 Requires-Dist: python-dotenv
 Requires-Dist: rich
-Requires-Dist: pandera
+Requires-Dist: pandera==0.20.4
 Requires-Dist: XlsxWriter
 Requires-Dist: pywin32; platform_system == "Windows"
 Provides-Extra: test
@@ -56,6 +47,9 @@ estimated by a bottom- up approach, based on the building stock floor area, ener
 systems. The mathematical model is implemented in Python, with input and output files in excel or csv.
 
 
+![ebm-in-windows-terminal.png](docs/source/_static/getting_started/ebm-in-windows-terminal.png)
+
+
 # Getting Started
 
 ## More information
@@ -75,12 +69,6 @@ how ti install EBM as a user.
 
 Open a terminal application and navigate to wherever you want to do work. 
 
-### Clone the github repository
-
-`git clone https://github.com/NVE/ebm`
-
-`cd ebm`
-
 ### Make a python virtual environment (optional)
 
 While optional, it is always recommended to install and run python modules in a discrete virtual environment. To create a 
@@ -105,7 +93,24 @@ To use your venv you need to activate it
 More information on [Python virtual environments](https://realpython.com/python-virtual-environments-a-primer/)
 
 
-### Install EBM
+## Install EBM
+
+There are two options. **Install from PyPI** (Python package index) or install **clone the github repository**.
+
+### Install from PyPI
+
+`python -m pip install ebm`
+
+You can now run the model as a module `python -m ebm` or as a program `ebm`
+
+Please refer to [getting started](https://nve.github.io/ebm-docs/user_guide/getting_started.html) for more information on how the model works.
+
+
+### Clone the github repository
+
+`git clone https://github.com/NVE/ebm`
+
+`cd ebm`
 
 Make sure your current working directory is the EBM root. 
 
@@ -206,7 +211,7 @@ This project is licensed under the MIT License. You are free to use, modify, and
 We welcome contributions! Please refer to the Contributing Guide (CONTRIBUTING.md) for details on how to get started.
 
 ## Documentation
-Full documentation is available at the EBM User Guide: https://nve.github.io/ebm-docs/
+Full documentation is available at the EBM User Guide: https://nve.github.io/ebm/
 
 
 

{ebm-0.99.5 → ebm-0.99.7}/ebm.egg-info/requires.txt

@@ -4,7 +4,7 @@ openpyxl
 pandas
 python-dotenv
 rich
-pandera
+pandera==0.20.4
 XlsxWriter
 
 [:platform_system == "Windows"]

{ebm-0.99.5 → ebm-0.99.7}/pyproject.toml

@@ -1,30 +1,14 @@
 [build-system]
-requires = ["setuptools>=42"]
+requires = ["setuptools"] #>=42
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "ebm"
 dynamic = ["version"]
 description = "A project for energy usage modeling"
-keywords = ["egg", "bacon"]
-classifiers = [
-  "Development Status :: 3 - Alpha",
-
-  "Intended Audience :: Science/Research",
-  "Topic :: Scientific/Engineering :: Information Analysis",
-
-  "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python :: 3.12",
-  "Programming Language :: Python :: 3.13",
-]
-
 readme = "README.md"
-license = {text="MIT"}
 authors = [
-    { name = "Ny Forbruksmodell", email = "ebm@nve.no" },
     { name = "Lars Petrusson", email = "lfep@nve.no" },
-    { name = "Mohammed Ettyabi", email= "moe@nve.no"},
     { name = "Ketil Nordstad", email = "kenord@nve.no" }
 ]
 requires-python = ">= 3.11"
@@ -35,7 +19,7 @@ dependencies = [
     "pandas", 
     "python-dotenv", 
     "rich",
-    "pandera",
+    "pandera==0.20.4",
     "XlsxWriter",
     "pywin32 ; platform_system == 'Windows'",
 ]
@@ -48,7 +32,7 @@ tqdm = ['tqdm', 'XlsxWriter']
 [project.urls]
 Homepage = "https://www.nve.no/"
 Documentation = "https://nve.github.io/ebm-docs"
-Repository = "https://github.com/NVE/ebm.git"
+Repository = "https://github.com/NVE/ebm"
 
 [tool.setuptools]
 packages = ['ebm', 'ebm.model', 'ebm.services', 'ebm.cmd', 'ebm.data']
@@ -60,7 +44,7 @@ ebm-calibrate = "ebm.cmd.calibrate_excel_com_io:main"
 version = {attr = "ebm.__version__.version"}
 
 [tool.setuptools.package-data]
-ebm = ["*.csv"]
+mypackage = ["*.csv"]
 [tool.pytest.ini_options]
 pythonpath = "."
 testpaths = ["tests"]

ebm-0.99.5/ebm/__version__.py

@@ -1 +0,0 @@
-version = "0.99.5"