Merge branch 'dev' into feature/data_analysis_tutorial

oemof · Aug 19, 2024 · 0ea25fd · 0ea25fd
2 parents 1bb2372 + 91c66bc
commit 0ea25fd
Show file tree

Hide file tree

Showing 251 changed files with 18,279 additions and 16,761 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,4 @@
+[flake8]
+max-line-length = 79
+exclude = */migrations/*, docs/conf.py
+ignore = E203, W503
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,7 +25,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  -   OS: (e.g. iOS, Debian, Ubunut, Windows10)
- -   Python version (e.g. 3.8)
+ -   Python version (e.g. 3.11)
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/workflows/tox_pytests.yml b/.github/workflows/tox_pytests.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10"]
+        python-version: [3.9, "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v1

diff --git a/.gitignore b/.gitignore
@@ -20,8 +20,9 @@ develop-eggs
 .installed.cfg
 lib
 lib64
-venv*/
-pyvenv*/
+venv/
+.venv/
+pyvenv/
 pip-wheel-metadata/
 
 # Installer logs

diff --git a/.prospector.yml b/.prospector.yml
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -0,0 +1,7 @@
+filter:
+    paths:
+        - src/
+        - examples/
+    excluded_paths:
+      - "*/experimental/*"       # submodules marked experimental
+
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -119,9 +119,9 @@ Available standard environments are::
     clean
     check
     docs
-    py37
-    py38
     py39
+    py310
+    py311
 
 To run a subset of tests::
 

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.rst b/README.rst
@@ -61,9 +61,9 @@
     :alt: Supported implementations
     :target: https://pypi.org/project/oemof.solph
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/oemof/oemof-solph/v0.5.1/dev
+.. |commits-since| image:: https://img.shields.io/github/commits-since/oemof/oemof-solph/latest/dev
     :alt: Commits since latest release
-    :target: https://github.com/oemof/oemof-solph/compare/v0.5.1...dev
+    :target: https://github.com/oemof/oemof-solph/compare/master...dev
 
 .. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.596235.svg
     :alt: Zenodo DOI
@@ -267,7 +267,7 @@ or by e-mailing us (see `here <https://oemof.org/contact/>`_ for contact informa
 License
 =======
 
-Copyright (c) 2023 oemof developer group
+Copyright (c) oemof developer group
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/VERSION b/VERSION
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,9 +119,9 @@ Available standard environments are:: @@
         clean
         check
         docs
-        py37
-        py38
         py39
+        py310
+        py311
     To run a subset of tests::
@@ Expand Down @@