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

Merge branch 'prepare-release-2.1' into 'master'

Prepare release 2.1

See merge request !114
parents 88e5e251 dd9d4a42
No related branches found
No related tags found
1 merge request!114Prepare release 2.1
Pipeline #49881 passed
Pipeline: AlekSIS

#49889

    ......@@ -9,6 +9,9 @@ and this project adheres to `Semantic Versioning`_.
    Unreleased
    ----------
    `2.1`_ - 2022-01-13
    -------------------
    Added
    ~~~~~
    ......@@ -148,3 +151,4 @@ Fixed
    .. _2.0rc2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0rc2
    .. _2.0rc3: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0rc3
    .. _2.0: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0
    .. _2.1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1
    ......@@ -32,7 +32,7 @@ Licence
    Copyright © 2018, 2019, 2020, 2021 Jonathan Weth <dev@jonathanweth.de>
    Copyright © 2018, 2019 Frank Poetzsch-Heffter <p-h@katharineum.de>
    Copyright © 2019, 2020 Dominik George <dominik.george@teckids.org>
    Copyright © 2019, 2020, 2021 Dominik George <dominik.george@teckids.org>
    Copyright © 2019, 2020 Tom Teichler <tom.teichler@teckids.org>
    Copyright © 2019 Julian Leucker <leuckeju@katharineum.de>
    Copyright © 2019 mirabilos <thorsten.glaser@teckids.org>
    ......
    ......@@ -12,7 +12,7 @@ class UntisConfig(AppConfig):
    copyright_info = (
    ([2018, 2019, 2020, 2021], "Jonathan Weth", "dev@jonathanweth.de"),
    ([2018, 2019], "Frank Poetzsch-Heffter", "p-h@katharineum.de"),
    ([2019, 2020], "Dominik George", "dominik.george@teckids.org"),
    ([2019, 2020, 2021], "Dominik George", "dominik.george@teckids.org"),
    ([2019, 2020], "Tom Teichler", "tom.teichler@teckids.org"),
    ([2019], "Julian Leucker", "leuckeju@katharineum.de"),
    ([2019], "mirabilos", "thorsten.glaser@teckids.org"),
    ......
    ......@@ -29,9 +29,9 @@ copyright = "2018-2022 The AlekSIS team"
    author = "The AlekSIS Team"
    # The short X.Y version
    version = "2.2"
    version = "2.1"
    # The full version, including alpha/beta/rc tags
    release = "2.2.1.dev0"
    release = "2.1.1.dev0"
    # -- General configuration ---------------------------------------------------
    ......
    [tool.poetry]
    name = "AlekSIS-App-Untis"
    version = "2.1.dev0"
    version = "2.1.1.dev0"
    packages = [
    { include = "aleksis" }
    ]
    ......@@ -23,7 +23,7 @@ repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-Untis"
    documentation = "https://aleksis.org/AlekSIS/docs/html/"
    keywords = ["SIS", "education", "school", "timetable", "plans"]
    classifiers = [
    "Development Status :: 4 - Beta",
    "Development Status :: 5 - Production/Stable",
    "Environment :: Web Environment",
    "Framework :: Django :: 3.0",
    "Intended Audience :: Education",
    ......@@ -41,8 +41,8 @@ python = "^3.9"
    mysqlclient = "^2.0.0"
    tqdm = "^4.44.1"
    defusedxml = "^0.7.0"
    aleksis-core = "^2.0rc"
    aleksis-app-chronos = "^2.0rc"
    aleksis-core = "^2.0"
    aleksis-app-chronos = "^2.0"
    [tool.poetry.dev-dependencies]
    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