From cd30bd03e2cff43a3f4298a5e365f623f87662ff Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Thu, 1 Sep 2022 12:31:48 +0200
Subject: [PATCH] Prepare release 2.1.1
---
CHANGELOG.rst | 5 +++--
docs/conf.py | 2 +-
pyproject.toml | 4 ++--
tox.ini | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8ab6d80ee..06c9b4988 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,8 +6,8 @@ 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.1`_ - 2022-09-01
+---------------------
Fixed
~~~~~
@@ -271,3 +271,4 @@ Fixed
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0
.. _2.0.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0.1
.. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.1
+.. _2.1.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.1.1
diff --git a/docs/conf.py b/docs/conf.py
index 1bb1712a1..b3d419667 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.1.dev0"
+release = "2.1.1"
# -- General configuration ---------------------------------------------------
diff --git a/pyproject.toml b/pyproject.toml
index eb3cff73a..6fb524133 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "AlekSIS-App-Alsijil"
-version = "2.1.1.dev0"
+version = "2.1.1"
packages = [
{ include = "aleksis" }
]
@@ -48,7 +48,7 @@ secondary = true
[tool.poetry.dependencies]
python = "^3.9"
-aleksis-core = "^2.11"
+aleksis-core = "^2.10"
aleksis-app-chronos = "^2.2"
aleksis-app-stoelindeling = { version = "^1.0", optional = true }
diff --git a/tox.ini b/tox.ini
index 78e09567e..749e0606f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ skip_install = true
envdir = {toxworkdir}/globalenv
commands_pre =
poetry install
- poetry run aleksis-admin webpack_bundle
+ poetry run aleksis-admin yarn install
poetry run aleksis-admin collectstatic --no-input
commands =
poetry run pytest --cov=. {posargs} aleksis/
--
GitLab