diff --git a/.circleci/config.yml b/.circleci/config.yml index 21f8110883..5b29c19454 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -431,6 +431,9 @@ workflows: - pipenv-install - setup-test-reporter: context: codeclimate + filters: + branches: + ignore: main - test: requires: - pipenv-install @@ -476,6 +479,9 @@ workflows: - shellcheck/check: dir: ./dev-tools external_sources: true + filters: + branches: + ignore: main - build-documentation: requires: - pipenv-install diff --git a/CHANGELOG.md b/CHANGELOG.md index 5229be9b82..a8b9a612b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,6 @@ UNRELEASED ---------- - -2022.3.4 --------- - * [ [#1108](https://github.com/digitalfabrik/integreat-cms/issues/1108) ] Support SVG images in PDF export * [ [#1284](https://github.com/digitalfabrik/integreat-cms/issues/1284) ] Inherit status of new translations from source language on XLIFF import * [ [#1047](https://github.com/digitalfabrik/integreat-cms/issues/1047) ] Provide option to only export public versions as XLIFF diff --git a/integreat_cms/__init__.py b/integreat_cms/__init__.py index 4b410e72b7..13ad1419b5 100644 --- a/integreat_cms/__init__.py +++ b/integreat_cms/__init__.py @@ -1 +1 @@ -__version__ = "2022.3.4" +__version__ = "2022.3.3" diff --git a/setup.cfg b/setup.cfg index 3bb9ac5c92..c17547aed9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = integreat-cms -version = 2022.3.4 +version = 2022.3.3 author = Tür an Tür – Digitalfabrik gGmbH author_email = tech@integreat-app.de description = Content Management System for the Integreat App @@ -72,7 +72,7 @@ include_package_data = True scripts = integreat_cms/integreat-cms-cli [bumpver] -current_version = 2022.3.4 +current_version = 2022.3.3 version_pattern = YYYY.MM.INC0[-TAG] commit_message = Bump version to {new_version} diff --git a/sphinx/conf.py b/sphinx/conf.py index 17ad740267..ad9729438b 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -44,7 +44,7 @@ django_github_url = f"https://github.com/django/django/blob/stable/{django_version}.x" #: The full version, including alpha/beta/rc tags -release = "2022.3.4" +release = "2022.3.3" # -- General configuration ---------------------------------------------------