Merge pull request #353 from KoalixSwitzerland/development

Release Merge Request Version 1.13.0
KoalixSwitzerland · Apr 4, 2024 · 2cf9382 · 2cf9382
2 parents 87d1253 + 9661cec
commit 2cf9382
Show file tree

Hide file tree

Showing 205 changed files with 5,760 additions and 1,465 deletions.
diff --git a/.directory b/.directory
diff --git a/.github/workflows/buildAndReleasePyPiPackage.yaml b/.github/workflows/buildAndReleasePyPiPackage.yaml
@@ -0,0 +1,39 @@
+name: Build and Release PyPI Package
+
+on:
+  push:
+    # Run this workflow when a new git tag is pushed
+    tags:
+      - '*'
+
+jobs:
+  build_and_release:
+    name: Build and Release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        run: python -m pip install --upgrade pip setuptools wheel
+
+      - name: Build package
+        run: python setup.py sdist bdist_wheel
+
+      - name: Install twine
+        run: pip install twine
+
+      - name: Check distribution
+        run: twine check dist/*
+
+      - name: Publish package
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: twine upload dist/*
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -0,0 +1,29 @@
+name: Django CI
+
+on:
+  push:
+    branches: [ "master", "development"]
+  pull_request:
+    branches: [ "master", "development" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Build Docker Image
+      run: docker-compose build web
+
+    - name: Run Tests in Docker
+      run: | 
+        docker-compose run --service-ports web coverage run -m pytest  --cov=koalixcrm --cov-branch --cov-report xml:test_report/coverage.xml --cov-report term
+        bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r test_report/coverage.xml
+      env:
+        CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+    - name: Upload Coverage Report
+      uses: actions/upload-artifact@v2
+      with:
+        name: coverage-report
+        path: test_results/coverage.xml
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,16 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: documentation/source/conf.py
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile.prod b/Dockerfile.prod
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2009-2018, Aaron Riedener, Untereggen, Switzerland
+Copyright (c) 2009-2024, Aaron Riedener, Untereggen, Switzerland
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@
 ## Quality badges on master
 | Project build: | Codacy results: |Docker: | Social Networks: |
 | --- | --- | --- | --- |
-| [![Build Status](https://travis-ci.org/scaphilo/koalixcrm.svg?branch=master)](https://travis-ci.org/scaphilo/koalixcrm) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4f0acae8f6d04c2b81c0c4a4b2b48e09)](https://www.codacy.com/app/simon.riedener/koalixcrm?utm_source=github.com&utm_medium=referral&utm_content=scaphilo/koalixcrm&utm_campaign=badger) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/4f0acae8f6d04c2b81c0c4a4b2b48e09)](https://www.codacy.com/app/simon.riedener/koalixcrm?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=scaphilo/koalixcrm&amp;utm_campaign=Badge_Coverage) | [![Docker Automated build](https://img.shields.io/docker/automated/koalixswitzerland/koalixcrm.svg)]() [![Docker Build Status](https://img.shields.io/docker/build/koalixswitzerland/koalixcrm.svg)]()<br/> [![Docker Stars](https://img.shields.io/docker/stars/koalixswitzerland/koalixcrm.svg)]() [![Docker Pulls](https://img.shields.io/docker/pulls/koalixswitzerland/koalixcrm.svg)]() | [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/koalix-crm/Lobby) |
+| [![Django CI](https://github.com/KoalixSwitzerland/koalixcrm/actions/workflows/django.yml/badge.svg)](https://github.com/KoalixSwitzerland/koalixcrm/actions/workflows/django.yml) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/cfae578b5c174f438786c935fa425002)](https://app.codacy.com/gh/KoalixSwitzerland/koalixcrm/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) </br> [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/cfae578b5c174f438786c935fa425002)](https://app.codacy.com/gh/KoalixSwitzerland/koalixcrm/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)| [![Docker Automated build](https://img.shields.io/docker/automated/koalixswitzerland/koalixcrm.svg)]() <br/> [![Docker Stars](https://img.shields.io/docker/stars/koalixswitzerland/koalixcrm.svg)]() [![Docker Pulls](https://img.shields.io/docker/pulls/koalixswitzerland/koalixcrm.svg)]() | [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/koalix-crm/Lobby) |
 
 ## Demos
 The demo-branch is automatically deployed and can be found here:

diff --git a/app.json b/app.json
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -0,0 +1,10 @@
+version: '3.8'
+
+services:
+  web:
+    image: ghcr.io/koalixswitzerland/koalixcrm-dev-container:main
+    ports:
+      - "8000:8000"
+    volumes:
+      - .:/usr/src/app
+      - ./data:/usr/src/app/data
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/documentation/source/architecture.rst b/documentation/source/architecture.rst
@@ -1,7 +1,7 @@
 .. highlight:: rst
 
 Architecture
-========
+============
 
 Standard installation with docker, postgres
 -------------------------------------------