Skip to content

Commit 35df5c3

Browse files
authored
Merge pull request #352 from KoalixSwitzerland/#351_AutomatePyPiGeneration
#351 automate PyPi generation
2 parents fec4408 + ebdaed6 commit 35df5c3

File tree

10 files changed

+71
-23
lines changed

10 files changed

+71
-23
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/*

.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

Whitespace-only changes.

Procfile

-1
This file was deleted.

app.json

-10
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
-------------------------------------------

documentation/source/conf.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
# If extensions (or modules to document with autodoc) are in another directory,
1515
# add these directories to sys.path here. If the directory is relative to the
1616
# documentation root, use os.path.abspath to make it absolute, like shown here.
17-
import os
17+
1818
import sys
19+
import os
20+
sys.path.insert(0, os.path.abspath('../..'))
1921
import django
22+
from koalixcrm.version import KOALIXCRM_VERSION
2023

21-
sys.path.insert(0, os.path.abspath('../..'))
22-
os.environ['DJANGO_SETTINGS_MODULE'] = 'projectsettings.settings.development_sqlite_settings'
24+
os.environ['DJANGO_SETTINGS_MODULE'] = 'projectsettings.settings.development_docker_sqlite_settings'
2325
django.setup()
2426

2527
# -- General configuration -----------------------------------------------------
@@ -44,7 +46,7 @@
4446

4547
# General information about the project.
4648
project = u'koalixcrm'
47-
copyright = u'2017, Aaron Riedener'
49+
copyright = u'2024, Aaron Riedener'
4850

4951
# The version info for the project you're documenting, acts as replacement for
5052
# |version| and |release|, also used in various other places throughout the
@@ -53,7 +55,7 @@
5355
# The short X.Y version.
5456
version = 'Alpha'
5557
# The full version, including alpha/beta/rc tags.
56-
release = '1.11'
58+
release = KOALIXCRM_VERSION
5759

5860
# The language for content autogenerated by Sphinx. Refer to documentation
5961
# for a list of supported languages.

requirements/base_requirements.txt

Whitespace-only changes.

setup.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
from setuptools import setup, find_packages
22
from koalixcrm.version import KOALIXCRM_VERSION
33

4+
with open("README.md", "r", encoding="utf-8") as readme_file:
5+
long_description = readme_file.read()
6+
47
setup(name='koalix-crm',
58
version=KOALIXCRM_VERSION,
69
description='koalixcrm is a tiny and easy to use Customer-Relationship-Management'
710
' Software (CRM) including tiny and easy to use Accounting Software',
11+
long_description=long_description,
12+
long_description_content_type='text/markdown',
813
url='http://github.com/scaphilo/koalixcrm',
914
author='Aaron Riedener',
1015
author_email='aaron.riedener@gmail.com',
1116
license='BSD',
1217
packages=find_packages(exclude=["projectsettings", "documentation"]),
13-
install_requires=['Django==3.2.20',
18+
install_requires=['Django==3.2.25',
1419
'django-filebrowser==3.14.3',
1520
'lxml==5.1.0',
1621
'olefile==0.46',
17-
'Pillow==7.1.2',
22+
"Pillow==10.2.0",
1823
'psycopg2-binary==2.8.4',
1924
'pytz==2022.4',
2025
'django-grappelli==2.15.7',
@@ -28,6 +33,6 @@
2833
zip_safe=False,
2934
classifiers=['Development Status :: 4 - Beta',
3035
'Programming Language :: Python :: 3.10', ],
31-
python_requires='~=3.5',
36+
python_requires='~=3.10',
3237
include_package_data=True,
3338
)

0 commit comments

Comments
 (0)