mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2024-11-24 07:58:11 +01:00
commit
261b391895
7 changed files with 24 additions and 17 deletions
|
@ -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/main.zip -L -o /opt/downloads/cbpi-ui.zip \
|
||||
&& pip3 install --no-cache-dir /opt/downloads/cbpi-ui.zip \
|
||||
&& rm -rf /opt/downloads
|
|
@ -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
|
||||
|
||||
|
|
12
README.md
12
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)
|
||||
|
||||
<p align="center">
|
||||
<img src="https://github.com/craftbeerpi/craftbeerpi4-ui/blob/main/cbpi4ui/public/logo192.png?raw=true" alt="CraftBeerPi Logo"/>
|
||||
<img src="https://github.com/avollkopf/craftbeerpi4-ui/blob/main/cbpi4ui/public/logo192.png?raw=true" alt="CraftBeerPi Logo"/>
|
||||
</p>
|
||||
|
||||
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)
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
__version__ = "4.0.5.a12"
|
||||
__version__ = "4.0.5.a16"
|
||||
__codename__ = "Spring Break"
|
||||
|
||||
|
|
|
@ -16,5 +16,5 @@ username: cbpi
|
|||
password: 123
|
||||
|
||||
plugins:
|
||||
- cbpi4ui
|
||||
- cbpi4gui
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
19
setup.py
19
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='cbpi',
|
||||
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='cbpi',
|
|||
'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",
|
||||
|
@ -49,7 +56,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'] + (
|
||||
|
|
Loading…
Reference in a new issue