Skip to content

Commit 2cf9382

Browse files
authored
Merge pull request #353 from KoalixSwitzerland/development
Release Merge Request Version 1.13.0
2 parents 87d1253 + 9661cec commit 2cf9382

File tree

205 files changed

+5760
-1465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+5760
-1465
lines changed

.directory

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Build and Release PyPI Package
2+
3+
on:
4+
push:
5+
# Run this workflow when a new git tag is pushed
6+
tags:
7+
- '*'
8+
9+
jobs:
10+
build_and_release:
11+
name: Build and Release
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Check out code
16+
uses: actions/checkout@v2
17+
18+
- name: Set up Python 3.10
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: '3.10'
22+
23+
- name: Install dependencies
24+
run: python -m pip install --upgrade pip setuptools wheel
25+
26+
- name: Build package
27+
run: python setup.py sdist bdist_wheel
28+
29+
- name: Install twine
30+
run: pip install twine
31+
32+
- name: Check distribution
33+
run: twine check dist/*
34+
35+
- name: Publish package
36+
env:
37+
TWINE_USERNAME: __token__
38+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
39+
run: twine upload dist/*

.github/workflows/django.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Django CI
2+
3+
on:
4+
push:
5+
branches: [ "master", "development"]
6+
pull_request:
7+
branches: [ "master", "development" ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
16+
- name: Build Docker Image
17+
run: docker-compose build web
18+
19+
- name: Run Tests in Docker
20+
run: |
21+
docker-compose run --service-ports web coverage run -m pytest --cov=koalixcrm --cov-branch --cov-report xml:test_report/coverage.xml --cov-report term
22+
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r test_report/coverage.xml
23+
env:
24+
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
25+
- name: Upload Coverage Report
26+
uses: actions/upload-artifact@v2
27+
with:
28+
name: coverage-report
29+
path: test_results/coverage.xml

.readthedocs.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
# Required
5+
version: 2
6+
7+
# Set the OS, Python version and other tools you might need
8+
build:
9+
os: ubuntu-22.04
10+
tools:
11+
python: "3.10"
12+
13+
14+
# Build documentation in the "docs/" directory with Sphinx
15+
sphinx:
16+
configuration: documentation/source/conf.py

.travis.yml

-36
This file was deleted.

Dockerfile

-13
This file was deleted.

Dockerfile.prod

-12
This file was deleted.

Jenkinsfile

-153
This file was deleted.

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2009-2018, Aaron Riedener, Untereggen, Switzerland
3+
Copyright (c) 2009-2024, Aaron Riedener, Untereggen, Switzerland
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

Procfile

-1
This file was deleted.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
## Quality badges on master
2525
| Project build: | Codacy results: |Docker: | Social Networks: |
2626
| --- | --- | --- | --- |
27-
| [![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) |
27+
| [![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) |
2828

2929
## Demos
3030
The demo-branch is automatically deployed and can be found here:

app.json

-10
This file was deleted.

docker-compose.prod.yml

-14
This file was deleted.

docker-compose.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: '3.8'
2+
3+
services:
4+
web:
5+
image: ghcr.io/koalixswitzerland/koalixcrm-dev-container:main
6+
ports:
7+
- "8000:8000"
8+
volumes:
9+
- .:/usr/src/app
10+
- ./data:/usr/src/app/data

docker-compose.yml

-14
This file was deleted.

documentation/source/architecture.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. highlight:: rst
22

33
Architecture
4-
========
4+
============
55

66
Standard installation with docker, postgres
77
-------------------------------------------

0 commit comments

Comments
 (0)