Skip to content
Snippets Groups Projects
Commit db20e87a authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'release-2.0' into 'master'

Prepare release 2.0

See merge request !268
parents 587c804a 620c6535
No related branches found
No related tags found
1 merge request!268Prepare release 2.0
Pipeline #54336 canceled
...@@ -9,6 +9,9 @@ and this project adheres to `Semantic Versioning`_. ...@@ -9,6 +9,9 @@ and this project adheres to `Semantic Versioning`_.
Unreleased Unreleased
---------- ----------
`2.0` - 2022-02-06
------------------
Changed Changed
~~~~~~~ ~~~~~~~
...@@ -226,3 +229,4 @@ Fixed ...@@ -226,3 +229,4 @@ Fixed
.. _2.0rc5: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc5 .. _2.0rc5: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc5
.. _2.0rc6: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc6 .. _2.0rc6: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc6
.. _2.0rc7: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc7 .. _2.0rc7: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc7
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0
...@@ -31,7 +31,7 @@ author = "The AlekSIS Team" ...@@ -31,7 +31,7 @@ author = "The AlekSIS Team"
# The short X.Y version # The short X.Y version
version = "2.0" version = "2.0"
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = "2.0rc8" release = "2.0.1.dev0"
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
[tool.poetry] [tool.poetry]
name = "AlekSIS-App-Alsijil" name = "AlekSIS-App-Alsijil"
version = "2.0rc8" version = "2.0.1.dev0"
packages = [ packages = [
{ include = "aleksis" } { include = "aleksis" }
] ]
...@@ -48,8 +48,8 @@ secondary = true ...@@ -48,8 +48,8 @@ secondary = true
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.9" python = "^3.9"
aleksis-core = "^2.2" aleksis-core = "^2.7"
aleksis-app-chronos = "^2.0rc3" aleksis-app-chronos = "^2.2"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
aleksis-builddeps = "^6" aleksis-builddeps = "^6"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment