update_requirements

.github/workflows/test_00develop.yml

@@ -7,7 +7,6 @@ on:
 
 jobs:
   testing:
-    needs: autoformatting
     uses: ./.github/workflows/test_testing.yml
 
 

.github/workflows/test_testing.yml

@@ -1,4 +1,4 @@
-name: Testing
+name: Test Testing
 
 on:
   workflow_call:
@@ -12,12 +12,10 @@ jobs:
         os: [windows-latest]
 
     steps:
-    - name: Install GLPK Solver
-      run: | 
-        choco install glpk
-
     - name: Checkout Code
       uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref }}
 
     - name: Set up Python
       uses: actions/setup-python@v4
@@ -31,4 +29,24 @@ jobs:
         python -m pip install --upgrade pip
         pip install coverage
         pip install poetry
-        poetry install
+        poetry install --without dev
+
+    - name: Write requirements.txt
+      run: |
+        poetry export --without-hashes --without dev --output requirements.txt
+
+    - name: Commit and push changes
+      run: |
+        git config user.name "GitHub Actions"
+        git config user.email "actions@github.com"
+        git add requirements.txt
+        git commit -m "Update requirements.txt generated by Poetry"
+        git push
+#
+#      # Step 6: Push the changes back to the repository
+#    - name: Push changes
+#      run: |
+#        git push
+#      env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

pyproject.toml

@@ -1,60 +1,50 @@
-[tool.pytest.ini_options]
-addopts = [
-    "--import-mode=importlib",
+[tool.poetry]
+name = "adopt_net0"
+version = "0.1.0"  # Version is static, but you can use dynamic versioning if needed
+description = "A python package for multi energy system modelling"
+authors = [
+  "Jan F. Wiegner <j.f.wiegner@uu.nl>",
+  "Julia L. Tiggeloven <j.l.tiggeloven@uu.nl>",
+  "Luca Bertoni <l.bertoni@uu.nl>",
+  "Inge Ossentjuk <i.m.ossentjuk@uu.nl>",
+  "Matteo Gazzani <m.gazzani@uu.nl>"
 ]
+readme = "README.md"
+license = "MIT"
+homepage = "https://github.com/UU-ER/AdOpT-NET0"
+repository = "https://github.com/UU-ER/AdOpT-NET0"
+documentation = "https://adopt-net0.readthedocs.io"
 
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.build.targets.wheel]
-packages = ["adopt_net0"]
+[tool.poetry.dependencies]
+python = "^3.12"
+tsam = ">=2.3.1"
 
-[tool.hatch.build]
-include = ["adopt_net0/**"]
+[tool.poetry.group.test.dependencies]
 
-[tool.hatch.version]
-path = "version.py"
+[tool.poetry.group.dev.dependencies]
+Pyomo = ">=6.7.1"
+numpy = ">=1.26.4"
+pandas = ">=2.2.2"
+requests = ">=2.31.0"
+timezonefinder = ">=6.5.0"
+statsmodels = ">=0.14.1"
+pvlib = ">=0.10.4"
+scipy = ">=1.13.0"
+openpyxl = ">=3.1.2"
+pytest = ">=8.1.1"
+pwlf = ">=2.2.1"
+gurobipy = ">=11.0.1"
+scandir = ">=1.10.0"
+tables = ">=3.9.2"
 
-[project]
-name = "adopt_net0"
-dynamic = ["version"]
-authors = [
-  {name="Jan F. Wiegner", email="j.f.wiegner@uu.nl"},
-  {name="Julia L. Tiggeloven", email="j.l.tiggeloven@uu.nl"},
-  {name="Luca Bertoni", email="l.bertoni@uu.nl"},
-  {name="Inge Ossentjuk", email="i.m.ossentjuk@uu.nl"},
-  {name="Matteo Gazzani", email="m.gazzani@uu.nl"},
-]
-description = "A python package for multi energy system modelling"
-readme = "README.md"
-requires-python = ">=3.12"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License"
-]
-dependencies = [
-    "Pyomo>=6.7.1",
-    "numpy>=1.26.4",
-    "dill>=0.3.8",
-    "pandas>=2.2.2",
-    "requests>=2.31.0",
-    "timezonefinder>=6.5.0",
-    "statsmodels>=0.14.1",
-    "pvlib>=0.10.4",
-    "scipy>=1.13.0",
-    "openpyxl>=3.1.2",
-    "pytest>=8.1.1",
-    "scikit-learn>=1.4.2",
-    "pwlf>=2.2.1",
-    "gurobipy>=11.0.1",
-    "scandir>=1.10.0",
-    "tables>=3.9.2",
-    "tsam>=2.3.1"
-]
+[tool.poetry.urls]
+homepage = "https://github.com/UU-ER/AdOpT-NET0"
+issues = "https://github.com/UU-ER/AdOpT-NET0/issues"
+documentation = "https://adopt-net0.readthedocs.io"
 
+[tool.pytest.ini_options]
+addopts = "--import-mode=importlib"
 
-[project.urls]
-Homepage = "https://github.com/UU-ER/AdOpT-NET0"
-Issues = "https://github.com/UU-ER/AdOpT-NET0/issues"
-Documentation = "https://adopt-net0.readthedocs.io"
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

requirements.txt

@@ -1,23 +1,17 @@
-Pyomo>=6.7.1
-numpy<2.0.0
-dill>=0.3.8
-pandas>=2.2.2
-requests>=2.31.0
-timezonefinder>=6.5.0
-statsmodels>=0.14.1
-pvlib>=0.10.4
-scipy>=1.13.0
-setuptools>=69.2.0
-matplotlib>=3.8.4
-openpyxl>=3.1.2
-pytest>=8.1.1
-scikit-learn>=1.4.2
-pwlf>=2.2.1
-gurobipy>=11.0.1
-scandir>=1.10.0
-tables>=3.9.2
-pre-commit>=3.7.0
-black>=24.4.0
-tsam>=2.3.1
-sphinx>=7.3.7
-sphinx_rtd_theme>=2.0.0
+colorama==0.4.6 ; python_version >= "3.12" and python_version < "4.0" and platform_system == "Windows"
+highspy==1.8.1 ; python_version >= "3.12" and python_version < "4.0"
+joblib==1.4.2 ; python_version >= "3.12" and python_version < "4.0"
+networkx==3.4.2 ; python_version >= "3.12" and python_version < "4.0"
+numpy==2.1.3 ; python_version >= "3.12" and python_version < "4.0"
+pandas==2.2.3 ; python_version >= "3.12" and python_version < "4.0"
+ply==3.11 ; python_version >= "3.12" and python_version < "4.0"
+pyomo==6.8.2 ; python_version >= "3.12" and python_version < "4.0"
+python-dateutil==2.9.0.post0 ; python_version >= "3.12" and python_version < "4.0"
+pytz==2024.2 ; python_version >= "3.12" and python_version < "4.0"
+scikit-learn==1.5.2 ; python_version >= "3.12" and python_version < "4.0"
+scipy==1.14.1 ; python_version >= "3.12" and python_version < "4.0"
+six==1.16.0 ; python_version >= "3.12" and python_version < "4.0"
+threadpoolctl==3.5.0 ; python_version >= "3.12" and python_version < "4.0"
+tqdm==4.67.0 ; python_version >= "3.12" and python_version < "4.0"
+tsam==2.3.5 ; python_version >= "3.12" and python_version < "4.0"
+tzdata==2024.2 ; python_version >= "3.12" and python_version < "4.0"