Merge branch 'dev' into revision/network_submodule

oemof · Sep 27, 2023 · 131fe5b · 131fe5b
2 parents 012074c + 34f8146
commit 131fe5b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 75 deletions.
diff --git a/.cookiecutterrc b/.cookiecutterrc
diff --git a/.github/workflows/tox_pytests.yml b/.github/workflows/tox_pytests.yml
@@ -6,9 +6,7 @@ on:
       - master
       - dev
   pull_request:
-    branches:
-      - master
-      - dev
+
   workflow_dispatch:
   schedule:
     - cron: "0 5 * * 6"  # 5:00 UTC every Saturday

diff --git a/docs/conf.py b/docs/conf.py
@@ -20,7 +20,7 @@
 year = "2020"
 author = "Stephan Günther"
 copyright = "{0}, {1}".format(year, author)
-version = release = "0.5.0.alpha1"
+version = release = "0.5.0a2"
 
 pygments_style = "trac"
 templates_path = ["."]

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@ def read(*names, **kwargs):
 
 setup(
     name="oemof.network",
-    version="0.5.0.alpha1",
+    version="0.5.0a2",
     license="MIT",
     description="The network/graph submodules of oemof.",
     long_description=long_description,

diff --git a/src/oemof/network/__init__.py b/src/oemof/network/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.5.0.alpha1"
+__version__ = "0.5.0a2"
 
 from . import energy_system
 from . import graph