From 59274f23c2f555e8bb251ab92a9066274a0e366d Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Tue, 10 May 2022 17:52:23 +0200 Subject: [PATCH] some updated links --- Dockerfile | 2 +- README.md | 12 ++++++------ cbpi/__init__.py | 2 +- setup.py | 15 +++++++++++---- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 620b16b..23fa44e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest as download RUN apk --no-cache add curl && mkdir /downloads # Download installation files -RUN curl https://github.com/craftbeerpi/craftbeerpi4-ui/archive/main.zip -L -o ./downloads/cbpi-ui.zip +RUN curl https://github.com/avollkopf/craftbeerpi4-ui/archive/main.zip -L -o ./downloads/cbpi-ui.zip FROM python:3.9 as base diff --git a/README.md b/README.md index 5dfc777..49170d8 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # CraftBeerPi 4 -[![Build](https://github.com/craftbeerpi/craftbeerpi4/actions/workflows/build.yml/badge.svg)](https://github.com/craftbeerpi/craftbeerpi4/actions/workflows/build.yml) -[![GitHub license](https://img.shields.io/github/license/craftbeerpi/craftbeerpi4)](https://github.com/craftbeerpi/craftbeerpi4/blob/master/LICENSE) -![GitHub issues](https://img.shields.io/github/issues-raw/craftbeerpi/craftbeerpi4) -![PyPI](https://img.shields.io/pypi/v/cbpi) +[![Build](https://github.com/avollkopf/craftbeerpi4/actions/workflows/build.yml/badge.svg)](https://github.com/avollkopf/craftbeerpi4/actions/workflows/build.yml) +[![GitHub license](https://img.shields.io/github/license/avollkopf/craftbeerpi4)](https://github.com/avollkopf/craftbeerpi4/blob/master/LICENSE) +![GitHub issues](https://img.shields.io/github/issues-raw/avollkopf/craftbeerpi4) +![PyPI](https://img.shields.io/pypi/v/cbpi4) ![Happy Brewing](https://img.shields.io/badge/CraftBeerPi%204-Happy%20Brewing-%23FBB117)

- CraftBeerPi Logo + CraftBeerPi Logo

CraftBeerPi 4 is an open source software solution to control the brewing and @@ -36,4 +36,4 @@ For a more detailed description of a development setup without the _development ### Contributors Thanks to all the people who have contributed -[![contributors](https://contributors-img.web.app/image?repo=craftbeerpi/craftbeerpi4)](https://github.com/craftbeerpi/craftbeerpi4/graphs/contributors) +[![contributors](https://contributors-img.web.app/image?repo=avollkopf/craftbeerpi4)](https://github.com/avollkopf/craftbeerpi4/graphs/contributors) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 45269e2..e6101fc 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.0.5.a13" +__version__ = "4.0.5.a16" __codename__ = "Spring Break" diff --git a/setup.py b/setup.py index ca7e405..bd6d1f5 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from cbpi import __version__ import platform # read the contents of your README file -from os import popen +from os import popen, path localsystem = platform.system() raspberrypi=False @@ -13,13 +13,19 @@ if localsystem == "Linux": if len(model) != 0: raspberrypi=True +# read the contents of your README file +this_directory = path.abspath(path.dirname(__file__)) +with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: + long_description = f.read() setup(name='cbpi4', version=__version__, - description='CraftBeerPi', - author='Manuel Fritsch', + description='CraftBeerPi4 Brewing Software', + author='Manuel Fritsch / Alexander Vollkopf', author_email='manuel@craftbeerpi.com', url='http://web.craftbeerpi.com', + project_urls={ + 'Documentation': 'https://openbrewing.gitbook.io/craftbeerpi4_support/'}, packages=find_packages(), include_package_data=True, package_data={ @@ -28,7 +34,8 @@ setup(name='cbpi4', 'cbpi': ['*','*.txt', '*.rst', '*.yaml']}, python_requires='>=3.9', - + long_description=long_description, + long_description_content_type='text/markdown', install_requires=[ "aiohttp==3.8.1", "aiohttp-auth==0.1.1",