diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 06c9b49880087d62c816a08c0e828c78a3b0e945..d8afb758fa5c3b90136cbe45d55d0aec50d3172f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,9 @@ 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 --------------------- diff --git a/docs/conf.py b/docs/conf.py index b3d4196670e00c0234c794ac835a8d3ae4ee298e..59ca213449c1f46b86ef5340aaac7c21447cb4e8 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" +release = "2.2.dev0" # -- General configuration --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 6fb5241332f93c2e2c8c94473a82712c71a8f26b..bb15d014a4509f016d7d5c7e940dcbc6bb249c08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "AlekSIS-App-Alsijil" -version = "2.1.1" +version = "2.2.dev0" packages = [ { include = "aleksis" } ] @@ -48,7 +48,7 @@ secondary = true [tool.poetry.dependencies] python = "^3.9" -aleksis-core = "^2.10" +aleksis-core = "^2.11" aleksis-app-chronos = "^2.2" aleksis-app-stoelindeling = { version = "^1.0", optional = true } diff --git a/tox.ini b/tox.ini index 749e0606f4f02fcbd1649627219b15850cbc0a90..78e09567e193b72a299dfb3f776499420ecc04ec 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 yarn install + poetry run aleksis-admin webpack_bundle poetry run aleksis-admin collectstatic --no-input commands = poetry run pytest --cov=. {posargs} aleksis/