Merge pull request #122 from PiBrewing/development

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

View file

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

View file

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

View file

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