Merge pull request #168 from marcus67/master

Release 0.4.19

Author: marcus67

.circleci/config.yml

@@ -1,4 +1,4 @@
-#    Copyright (C) 2019  Marcus Rickert
+#    Copyright (C) 2019-2022  Marcus Rickert
 #
 #    See https://github.com/marcus67/python_base_app
 #
@@ -22,54 +22,53 @@
 ##################################################################################
 
 version: 2.0
+
 jobs:
   build:
     #working_directory: ~
     docker:
-      - image: accso/docker-python-app:latest
+      - image: marcusrickert/docker-python-app:latest
     steps:
       - checkout
 
       # Check out all sub modules
       # See https://circleci.com/docs/2.0/configuration-reference/#checkout
       - run: git submodule sync
       - run: git submodule update --init
-
       - run: PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage BUILD --use-dev-dir=.
       - run: PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage INSTALL
       - run: PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage TEST --use-dev-dir .
       - run: codecov
       - store_artifacts:
           path: htmlcov
       - store_artifacts:
-          path: debian/little-brother_0.4.12_112.deb
+          path: debian/little-brother_0.4.19_121.deb
       - persist_to_workspace:
           root: debian
           paths:
-            - little-brother_0.4.12_112.deb
+            - little-brother_0.4.19_121.deb
   build_pypi:
     #working_directory: ~
     docker:
-      - image: accso/docker-python-app:latest
+      - image: marcusrickert/docker-python-app:latest
     steps:
       - checkout
 
       # Check out all sub modules
       # See https://circleci.com/docs/2.0/configuration-reference/#checkout
       - run: git submodule sync
       - run: git submodule update --init
-
       - run: PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage BUILD --use-dev-dir=.
       - store_artifacts:
-          path: "dist/little-brother-0.4.12.tar.gz"
+          path: "dist/little-brother-0.4.19.tar.gz"
       - persist_to_workspace:
           root: dist
           paths:
-            - "little-brother-0.4.12.tar.gz"
+            - "little-brother-0.4.19.tar.gz"
   install_pypi:
     #working_directory: ~
     docker:
-      - image: accso/docker-python-app:latest
+      - image: marcusrickert/docker-python-app:latest
     steps:
       - checkout
       - attach_workspace:
@@ -79,7 +78,6 @@ jobs:
       # See https://circleci.com/docs/2.0/configuration-reference/#checkout
       - run: git submodule sync
       - run: git submodule update --init
-
       - run: PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage INSTALL-PYPI-PACKAGE --use-dev-dir=.
       - run: PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage TEST --use-dev-dir .
       - run: codecov
@@ -88,7 +86,7 @@ jobs:
   publish_pypi:
     #working_directory: ~
     docker:
-      - image: accso/docker-python-app:latest
+      - image: marcusrickert/docker-python-app:latest
     steps:
       - checkout
       - attach_workspace:
@@ -98,11 +96,10 @@ jobs:
       # See https://circleci.com/docs/2.0/configuration-reference/#checkout
       - run: git submodule sync
       - run: git submodule update --init
-
       - run: PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage PUBLISH-PYPI-PACKAGE --use-dev-dir=.
   deploy:
     docker:
-      - image: accso/docker-python-app:latest
+      - image: marcusrickert/docker-python-app:latest
     steps:
       - checkout
       - attach_workspace:

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-#    Copyright (C) 2019-2021  Marcus Rickert
+#    Copyright (C) 2019-2022  Marcus Rickert
 #
 #    See https://github.com/marcus67/python_base_app
 #
@@ -21,14 +21,18 @@
 # but only to python_base_app/templates/gitlab-ci.template.yml!                  #
 ##################################################################################
 
+variables:
+  PIP3: "./bin/pip3.sh"
+
 stages:
   - build
   - install_and_check
   - analyze
   - deploy
+  - publish
 
 build_debian:
-  image: accso/docker-python-app:latest
+  image: marcusrickert/docker-python-app:latest
   stage: build
   script:
     - PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage BUILD --use-dev-dir=.
@@ -40,7 +44,7 @@ build_debian:
     GIT_SUBMODULE_STRATEGY: recursive
 
 test_debian:
-  image: accso/docker-python-app:latest
+  image: marcusrickert/docker-python-app:latest
   stage: install_and_check
   script:
     - PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage INSTALL
@@ -55,7 +59,7 @@ test_debian:
     GIT_SUBMODULE_STRATEGY: recursive
 
 build_pypi:
-  image: accso/docker-python-app:latest
+  image: marcusrickert/docker-python-app:latest
   stage: build
   script:
     - PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage BUILD --use-dev-dir=.
@@ -64,13 +68,13 @@ build_pypi:
   artifacts:
       when: always
       paths:
-        - dist/little-brother-0.4.12.tar.gz
+        - dist/little-brother-0.4.19.tar.gz
   variables:
     # Suppress automatic checkout for all sub modules
     GIT_SUBMODULE_STRATEGY: recursive
 
 install_pypi:
-  image: accso/docker-python-app:latest
+  image: marcusrickert/docker-python-app:latest
   stage: install_and_check
   script:
     - PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage INSTALL-PYPI-PACKAGE --use-dev-dir=.
@@ -87,7 +91,7 @@ install_pypi:
     GIT_SUBMODULE_STRATEGY: recursive
 
 analyze:
-  image: accso/docker-python-app:latest
+  image: marcusrickert/docker-python-app:latest
   stage: analyze
   script:
     - PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage ANALYZE --use-dev-dir=.
@@ -101,7 +105,13 @@ docker:
   image: marcusrickert/docker-docker-ci:release-0.9.1
   stage: deploy
   script:
-  - PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage BUILD_DOCKER_IMAGES --use-dev-dir=.
+    - PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage BUILD_DOCKER_IMAGES --use-dev-dir=.
   variables:
     # Activate automatic checkout for all sub modules
     GIT_SUBMODULE_STRATEGY: recursive
+
+publish_pypi:
+  image: marcusrickert/docker-python-app:latest
+  stage: publish
+  script:
+    - PYTHONPATH=contrib/python_base_app python3 ci_toolbox.py --execute-stage PUBLISH-PYPI-PACKAGE --use-dev-dir=.

CHANGES.md

@@ -4,6 +4,44 @@
 
 This document lists all changes of `LittleBrother` with the most recent changes at the top.
 
+## Version 0.4.19 Revision 121 (February 13th, 2022)
+
+* Upgrade to `python_base_app` version 0.2.36 (lots of trouble releasing `python_base_app`)
+
+## Version 0.4.18 Revision 119 (February 5th, 2022)
+
+* Upgrade to `python_base_app` version 0.2.34
+
+## Version 0.4.17 Revision 117 (January 30th, 2022)
+
+* Closes #166, see [here](https://github.com/marcus67/little_brother/issues/166) 
+  (Thanks to [Bas Hulsken](https://github.com/bhulsken)!)
+* Upgrade package `alembic` to version 1.7.5
+* Make upgrade message in administration views more concise, include link to `CHANGES.md`
+
+## Version 0.4.16 Revision 116 (January 30th, 2022)
+
+* Upgrade to `python_base_app` version 0.2.33
+* Closes #165, see [here](https://github.com/marcus67/little_brother/issues/165)
+
+## Version 0.4.15 Revision 115 (January 28th, 2022)
+
+* Upgrade to `python_base_app` version 0.2.31
+* Closes #158, see [here](https://github.com/marcus67/little_brother/issues/158)
+* Closes #164, see [here](https://github.com/marcus67/little_brother/issues/164)
+
+## Version 0.4.14 Revision 114 (January 6th, 2022)
+
+* Closes #163, see [here](https://github.com/marcus67/little_brother/issues/163)
+
+## Version 0.4.13 Revision 113 (January 5th, 2022)
+
+* Add CODE_OF_CONDUCT.md and CONTRIBUTING.md
+* Added Snyk package health score badge
+* Add second Docker image 
+  [`little-brother-ubuntu-client`](https://hub.docker.com/repository/docker/marcusrickert/little-brother-ubuntu-client)
+* Renamed Docker image `little-brother-slave` to `little-brother-client`. 
+
 ## Version 0.4.12 Revision 112 (December 29th, 2021)
 
 * Closes #87, see [here](https://github.com/marcus67/little_brother/issues/87)
@@ -39,7 +77,7 @@ This document lists all changes of `LittleBrother` with the most recent changes
 * Upgrade WTForms to version 3.0.0a1
 
 
-## Version 0.4.8 Revision 107 (August 21th, 2021)
+## Version 0.4.8 Revision 107 (August 21st, 2021)
 
 *   Closes #130, see [here](https://github.com/marcus67/little_brother/issues/130)
 *   Provide `ruleset_check_interval` in `UserStatus`
@@ -96,9 +134,9 @@ This document lists all changes of `LittleBrother` with the most recent changes
 *   Split up test class `TestStatusServer`
 *   Add test cases for users page: 
     *   add and delete user, edit user,
-    *   assign/unassign rule set, 
+    *   assign/un-assign rule set, 
     *   move up/down rule set,
-    *   assign/unassign device
+    *   assign/un-assign device
 *   Add test cases for devices page: add and delete device, edit device
 *   Add test cases for admin page: edit rule override, add, extend, and delete time extension
 *   Add test cases for invalid data in rule override and device
@@ -265,7 +303,7 @@ This document lists all changes of `LittleBrother` with the most recent changes
 *   Update Italian localization (locale "it")
 *   Issue error when no database user is given when driver != sqlite
 *   Register logging filter for alembic
-*   Add latest change date of translations as column to localization table
+*   Add the latest change date of translations as column to localization table
 
 ## Version 0.3.0 Revision 65 (July 18th, 2020)
 

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+little-brother@web.de.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.