Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-11-25 00:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #122 from PiBrewing/development

Browse source 
Merge from Development to accomodate full compatibility with Pi 5
This commit is contained in:
Alexander Vollkopf 2023-12-31 11:58:57 +01:00 committed by GitHub
commit b67fe72fdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cbpi/__init__.py
View file

@ -1,3 +1,3 @@
__version__ = "4.2.0" __version__ = "4.3.0"
__codename__ = "Indian Summer" __codename__ = "Winter Storm"

8
requirements.txt
View file

@ -1,13 +1,13 @@
typing-extensions>=4 typing-extensions>=4
aiohttp==3.8.6 aiohttp==3.9.1
aiohttp-auth==0.1.1 aiohttp-auth==0.1.1
aiohttp-route-decorator==0.1.4 aiohttp-route-decorator==0.1.4
aiohttp-security==0.4.0 aiohttp-security==0.5.0
aiohttp-session==2.12.0 aiohttp-session==2.12.0
aiohttp-swagger==1.0.16 aiohttp-swagger==1.0.16
aiojobs==1.1.0 aiojobs==1.2.1
aiosqlite==0.17.0 aiosqlite==0.17.0
cryptography==41.0.5 cryptography==41.0.7
pyopenssl==23.3.0 pyopenssl==23.3.0
requests==2.31.0 requests==2.31.0
voluptuous==0.13.1 voluptuous==0.13.1

12
setup.py
View file

@ -8,7 +8,7 @@ from os import popen, path
localsystem = platform.system() localsystem = platform.system()
raspberrypi=False raspberrypi=False
if localsystem == "Linux": if localsystem == "Linux":
command="cat /proc/cpuinfo | grep Raspberry" command="cat /proc/cpuinfo | grep 'Raspberry'"
model=popen(command).read() model=popen(command).read()
if len(model) != 0: if len(model) != 0:
raspberrypi=True raspberrypi=True
@ -39,15 +39,15 @@ setup(name='cbpi4',
long_description_content_type='text/markdown', long_description_content_type='text/markdown',
install_requires=[ install_requires=[
"typing-extensions>=4", "typing-extensions>=4",
"aiohttp==3.8.6", "aiohttp==3.9.1",
"aiohttp-auth==0.1.1", "aiohttp-auth==0.1.1",
"aiohttp-route-decorator==0.1.4", "aiohttp-route-decorator==0.1.4",
"aiohttp-security==0.4.0", "aiohttp-security==0.5.0",
"aiohttp-session==2.12.0", "aiohttp-session==2.12.0",
"aiohttp-swagger==1.0.16", "aiohttp-swagger==1.0.16",
"aiojobs==1.1.0 ", "aiojobs==1.2.1 ",
"aiosqlite==0.17.0", "aiosqlite==0.17.0",
"cryptography==41.0.5", "cryptography==41.0.7",
"pyopenssl==23.3.0", "pyopenssl==23.3.0",
"requests==2.31.0", "requests==2.31.0",
"voluptuous==0.13.1", "voluptuous==0.13.1",
@ -63,7 +63,7 @@ setup(name='cbpi4',
'importlib_metadata', 'importlib_metadata',
'numpy==1.24.1', 'numpy==1.24.1',
'pandas==1.5.3'] + ( 'pandas==1.5.3'] + (
['RPi.GPIO==0.7.1'] if raspberrypi else [] ), ['rpi-lgpio'] if raspberrypi else [] ),
dependency_links=[ dependency_links=[
'https://testpypi.python.org/pypi', 'https://testpypi.python.org/pypi',