diff --git a/Dockerfile b/Dockerfile index 884bf9e..7f11171 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN pip3 install --no-cache-dir -r /cbpi-src/requirements.txt # Install RPi.GPIO separately because it's excluded in setup.py for non-raspberrys. # This can enable GPIO support for the image when used on a raspberry pi and the # /dev/gpiomem device. -RUN pip3 install --no-cache-dir RPi.GPIO==0.7.1a4 +RUN pip3 install --no-cache-dir RPi.GPIO==0.7.1 FROM base as deploy # Install craftbeerpi from source @@ -61,4 +61,4 @@ RUN ["cbpi", "setup"] EXPOSE 8000 # Start cbpi -CMD ["cbpi", "start"] \ No newline at end of file +CMD ["cbpi", "start"] diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 5c14468..778fc0e 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1 +1 @@ -__version__ = "4.0.1.14" +__version__ = "4.0.1.15" diff --git a/setup.py b/setup.py index 99d5137..cbce4c1 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ setup(name='cbpi', 'psutil==5.8.0', 'cbpi4ui', 'importlib_metadata'] + ( - ['RPi.GPIO==0.7.1a4'] if raspberrypi else [] ) + + ['RPi.GPIO==0.7.1'] if raspberrypi else [] ) + (['numpy==1.22.0'] if (int(platform.python_version_tuple()[1]) >= 9) and (int(platform.python_version_tuple()[0]) == 3) else ['numpy==1.20.3'] ) + (['pandas==1.4.0'] if (int(platform.python_version_tuple()[1]) >= 9) and (int(platform.python_version_tuple()[0]) == 3) else ['pandas==1.1.5'] ),