From 7bbe60720678454076c853245fdca3ac7e35b93b Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Fri, 21 Jan 2022 22:07:13 +0100
Subject: [PATCH] Bump version to 2.1 and update changelog
---
CHANGELOG.rst | 10 ++++++++--
docs/conf.py | 2 +-
pyproject.toml | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6a90877..740a37c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,14 +6,19 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
-Unreleased
-----------
+`2.1`_ - 2022-01-21
+-------------------
Added
~~~~~
* Person field matching can now be matched disjunctive
+Changed
+~~~~~~~
+
+* Update German translations.
+
Fixed
~~~~~
@@ -96,3 +101,4 @@ Added
.. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0rc2
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0
.. _2.0.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0.1
+.. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.1
diff --git a/docs/conf.py b/docs/conf.py
index e83736b..a820111 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,7 @@ author = "The AlekSIS Team"
# The short X.Y version
version = "2.1"
# The full version, including alpha/beta/rc tags
-release = "2.1.dev0"
+release = "2.1"
# -- General configuration ---------------------------------------------------
diff --git a/pyproject.toml b/pyproject.toml
index b4bd0dd..e9386f1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "AlekSIS-App-LDAP"
-version = "2.1.dev0"
+version = "2.1"
packages = [
{ include = "aleksis" }
]
--
GitLab