Merge pull request #1809 from digitalfabrik/develop

Release `2022.10.2`
digitalfabrik · Oct 26, 2022 · f4dc376 · f4dc376
2 parents 15ce171 + a631455
commit f4dc376
Show file tree

Hide file tree

Showing 36 changed files with 983 additions and 301 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,13 +5,13 @@ orbs:
 jobs:
   pipenv-install:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
     environment:
       PIPENV_VENV_IN_PROJECT: true
     steps:
       - checkout
       - restore_cache:
-          key: pipenv-{{ checksum "Pipfile.lock" }}-v2
+          key: pipenv-{{ checksum "Pipfile.lock" }}-v1
       - run:
           name: Install pip dependencies
           command: |
@@ -26,7 +26,7 @@ jobs:
               fi
             fi
       - save_cache:
-          key: pipenv-{{ checksum "Pipfile.lock" }}-v2
+          key: pipenv-{{ checksum "Pipfile.lock" }}-v1
           paths:
             - .venv
             - integreat_cms.egg-info
@@ -39,7 +39,8 @@ jobs:
             - integreat_cms.egg-info
   black:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
+    resource_class: small
     steps:
       - checkout
       - attach_workspace:
@@ -49,8 +50,7 @@ jobs:
           command: pipenv run black --check .
   pylint:
     docker:
-      - image: cimg/python:3.9
-    resource_class: xlarge
+      - image: cimg/python:3.9.14
     steps:
       - checkout
       - attach_workspace:
@@ -60,7 +60,8 @@ jobs:
           command: pipenv run pylint_runner
   check-translations:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
+    resource_class: small
     steps:
       - checkout
       - attach_workspace:
@@ -73,7 +74,7 @@ jobs:
           command: ./dev-tools/check_translations.sh
   compile-translations:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
     steps:
       - checkout
       - attach_workspace:
@@ -125,12 +126,13 @@ jobs:
             - integreat_cms/webpack-stats.json
   check-migrations:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
       - image: cimg/postgres:14.1
         environment:
           POSTGRES_USER: integreat
           POSTGRES_DB: integreat
           POSTGRES_PASSWORD: password
+    resource_class: small
     steps:
       - checkout
       - attach_workspace:
@@ -141,6 +143,7 @@ jobs:
   setup-test-reporter:
     docker:
       - image: cimg/base:stable
+    resource_class: small
     steps:
       - attach_workspace:
           at: .
@@ -158,14 +161,13 @@ jobs:
             - cc-test-reporter
   test:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
       - image: cimg/postgres:14.1
         environment:
           POSTGRES_USER: integreat
           POSTGRES_DB: integreat
           POSTGRES_PASSWORD: password
     parallelism: 16
-    resource_class: large
     steps:
       - checkout
       - attach_workspace:
@@ -191,6 +193,7 @@ jobs:
   upload-test-coverage:
     docker:
       - image: cimg/base:stable
+    resource_class: small
     steps:
       - attach_workspace:
           at: .
@@ -205,7 +208,7 @@ jobs:
             ./cc-test-reporter sum-coverage -o - coverage/codeclimate.*.json | ./cc-test-reporter upload-coverage --debug --input -
   build-package:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
     steps:
       - checkout
       - attach_workspace:
@@ -225,7 +228,7 @@ jobs:
             - dist
   publish-package:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
     steps:
       - checkout
       - attach_workspace:
@@ -235,7 +238,7 @@ jobs:
           command: pipenv run twine upload --non-interactive ./dist/integreat-cms-*.tar.gz
   build-documentation:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
     resource_class: large
     steps:
       - checkout
@@ -250,7 +253,8 @@ jobs:
             - docs
   deploy-documentation:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
+    resource_class: small
     environment:
       BRANCH: gh-pages
       DOC_DIR: docs
@@ -293,7 +297,8 @@ jobs:
             git push origin $BRANCH
   bump-dev-version:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
+    resource_class: small
     steps:
       - checkout
       - attach_workspace:
@@ -324,7 +329,8 @@ jobs:
             - integreat_cms/__init__.py
   bump-version:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
+    resource_class: small
     steps:
       - checkout
       - attach_workspace:
@@ -371,7 +377,8 @@ jobs:
           command: git checkout develop && git merge main --commit --no-edit && git push
   create-release:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.9.14
+    resource_class: small
     steps:
       - checkout
       - attach_workspace:
@@ -392,6 +399,7 @@ jobs:
   notify-mattermost:
     docker:
       - image: cimg/base:stable
+    resource_class: small
     steps:
       - checkout
       - run:
@@ -445,6 +453,9 @@ workflows:
           context: codeclimate
           requires:
             - test
+          filters:
+            branches:
+              only: /^(?!pull\/).*$/ 
       - check-translations:
           requires:
             - pipenv-install

diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -20,3 +20,6 @@ labels: feature
 ### Additional Context
 <!-- Add any other information or screenshots about the feature request here. -->
 
+
+### Design Requirements
+<!-- If the customization includes input from our design team, the detailed requirements will be collected here. Note: These will exist mainly in German to simplify internal communication. -->
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 UNRELEASED
 ----------
 
+* [ [#1808](https://github.com/digitalfabrik/integreat-cms/issues/1808) ] Improve calculation of HIX values via Textlab
+* [ [#1800](https://github.com/digitalfabrik/integreat-cms/issues/1800) ] Exclude archived pages from PDF exports
+* [ [#1802](https://github.com/digitalfabrik/integreat-cms/issues/1802) ] Reenable table of contents and page numbers in PDFs
+* [ [#1350](https://github.com/digitalfabrik/integreat-cms/issues/1350) ] Various small PDF export improvements
+* [ [#1777](https://github.com/digitalfabrik/integreat-cms/issues/1777) ] Fix autocompleting POI address for non-staff users
+* [ [#1749](https://github.com/digitalfabrik/integreat-cms/issues/1749) ] Fix region deletion error if media library has nested structure
+* [ [#1170](https://github.com/digitalfabrik/integreat-cms/issues/1170) ] Add map preview on POI form
+* [ [#1579](https://github.com/digitalfabrik/integreat-cms/issues/1579) ] Fix auto-filling of coordinates for multiple street numbers
+* [ [#1767](https://github.com/digitalfabrik/integreat-cms/issues/1767) ] Revert statistics calculation to original & add online downloads column
+
 
 2022.10.1
 ---------