From 8dccc1cfaaa3f7ba01fba6f0cf643d8c935f0c86 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Fri, 26 May 2023 13:10:16 +0200 Subject: [PATCH 1/3] :money_with_wings: Add KoFi to funding options --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 22194d1..da321c9 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ github: [penguineer] +ko_fi: penguineer From 081d8a0cb4a2f023e978097e714c862e66029146 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Fri, 26 May 2023 13:12:23 +0200 Subject: [PATCH 2/3] :page_facing_up: Add LICENSE text document and update license notice --- LICENSE.txt | 19 +++++++++++++++++++ README.md | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..e97d1b5 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,19 @@ +Copyright 2020-2023 Stefan Haun and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index d5d68e4..7eb3a58 100644 --- a/README.md +++ b/README.md @@ -63,4 +63,4 @@ If possible, please stick to the following guidelines: ## License -MIT © 2020-2022 Stefan Haun and contributors +[MIT](LICENSE.txt) © 2020-2023 Stefan Haun and contributors From 454faa2097c692dcbd5c512caee38be6ba0069cd Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Fri, 26 May 2023 13:13:20 +0200 Subject: [PATCH 3/3] :construction_worker: Change from master to main in workflows --- .github/workflows/docker-image.yml | 12 ++++++------ .github/workflows/pytest.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f4d8d3b..f5a06aa 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,12 +3,12 @@ name: Docker Image on: push: branches: - - 'master' + - 'main' tags: - 'v*' pull_request: branches: - - 'master' + - 'main' jobs: docker: @@ -32,17 +32,17 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v1 - + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - + - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - + - name: Build and push uses: docker/build-push-action@v2 with: diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index eb42e31..f9e08d3 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -2,9 +2,9 @@ name: PyTest on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: