From d36c18cb2a2d0cd07e8a8081d006a135913bfcd3 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Mon, 9 May 2022 17:10:36 +0200 Subject: [PATCH 1/5] rename app to cbpi4 for test release --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 944575f..ca7e405 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ if localsystem == "Linux": raspberrypi=True -setup(name='cbpi', +setup(name='cbpi4', version=__version__, description='CraftBeerPi', author='Manuel Fritsch', @@ -49,7 +49,7 @@ setup(name='cbpi', 'PyInquirer==1.0.3', 'colorama==0.4.4', 'psutil==5.9.0', - 'cbpi4ui', + 'cbpi4gui', 'importlib_metadata', 'numpy==1.22.2', 'pandas==1.4.1'] + ( From 29cc09c83703267e41507ce8394a2ae069abcbf1 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Mon, 9 May 2022 22:29:50 +0200 Subject: [PATCH 2/5] minor adaptions for release test --- cbpi/__init__.py | 2 +- cbpi/config/config.yaml | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index ea9d9b2..45269e2 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.0.5.a12" +__version__ = "4.0.5.a13" __codename__ = "Spring Break" diff --git a/cbpi/config/config.yaml b/cbpi/config/config.yaml index f7a5abe..2f05625 100644 --- a/cbpi/config/config.yaml +++ b/cbpi/config/config.yaml @@ -16,5 +16,5 @@ username: cbpi password: 123 plugins: -- cbpi4ui +- cbpi4gui diff --git a/requirements.txt b/requirements.txt index 088cdc4..0c49857 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pandas==1.4.1 shortuuid==1.0.8 tabulate==0.8.9 numpy==1.22.2 -cbpi4ui +cbpi4gui click==8.0.4 importlib_metadata==4.11.1 asyncio-mqtt From b1bd3dc9f48b41969d17a632ec7947b1dd9bfd37 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Tue, 10 May 2022 07:06:14 +0200 Subject: [PATCH 3/5] adapt for release test with different gui package --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0ac9cc3..7b30cab 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -15,6 +15,6 @@ RUN pip3 install --no-cache-dir -r /workspace/requirements.txt # Install current version of cbpi-ui RUN mkdir /opt/downloads \ - && curl https://github.com/craftbeerpi/craftbeerpi4-ui/archive/development.zip -L -o /opt/downloads/cbpi-ui.zip \ + && curl https://github.com/avollkopf/craftbeerpi4-ui/archive/testrelease.zip -L -o /opt/downloads/cbpi-ui.zip \ && pip3 install --no-cache-dir /opt/downloads/cbpi-ui.zip \ && rm -rf /opt/downloads \ No newline at end of file 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 4/5] 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", From 4744070063d4565cad9ed3dc129b31bcba61d184 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Wed, 11 May 2022 07:29:58 +0200 Subject: [PATCH 5/5] change docker ui to main --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7b30cab..732ba18 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -15,6 +15,6 @@ RUN pip3 install --no-cache-dir -r /workspace/requirements.txt # Install current version of cbpi-ui RUN mkdir /opt/downloads \ - && curl https://github.com/avollkopf/craftbeerpi4-ui/archive/testrelease.zip -L -o /opt/downloads/cbpi-ui.zip \ + && curl https://github.com/avollkopf/craftbeerpi4-ui/archive/main.zip -L -o /opt/downloads/cbpi-ui.zip \ && pip3 install --no-cache-dir /opt/downloads/cbpi-ui.zip \ && rm -rf /opt/downloads \ No newline at end of file