From 79d5951e594cf7105e48eb47a0582fea00849543 Mon Sep 17 00:00:00 2001 From: Stefal Date: Thu, 20 Jun 2024 21:32:26 +0200 Subject: [PATCH] cleaning old code and requirements. --- CHANGELOG.md | 3 ++- README.md | 3 ++- tools/install.sh | 15 --------------- web_app/requirements.txt | 30 +++++++++--------------------- 4 files changed, 13 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c408f..b249bfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ - RTKLib upgraded to release b34j from rtklibexplorer. - Switch server from eventlet to gevent + Gunicorn server. ### Deprecated - - Operating systems older than Debian 10 / Ubuntu 20.04 can't update RTKBase anymore. + - Operating systems older than Debian 11 / Ubuntu 22.04 can't update RTKBase anymore. + - Python release < 3.8 deprecated ### Removed - Eventlet python module is not needed anymore. ### Fixed diff --git a/README.md b/README.md index ca24018..2c99c4f 100644 --- a/README.md +++ b/README.md @@ -331,7 +331,8 @@ A gnss receiver with a timepulse output is a very accurate [stratum 0](https://e ``` ## Requirements: -Python >= 3.7 +Debian base distro >= 11 (Bullseye) +Python >= 3.8 ## History: See the [changelog](./CHANGELOG.md) diff --git a/tools/install.sh b/tools/install.sh index f159ea4..6b2d911 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -129,21 +129,6 @@ install_gpsd_chrony() { cp /lib/systemd/system/chrony.service /etc/systemd/system/chrony.service sed -i s/^After=.*/After=gpsd.service/ /etc/systemd/system/chrony.service - #If needed, adding backports repository to install a gpsd release that support the F9P - if lsb_release -sc | grep -qE 'bionic|buster' - then - if ! apt-cache policy | grep -qE 'buster-backports.* armhf' - then - #Adding buster-backports - echo 'deb http://httpredir.debian.org/debian buster-backports main contrib' > /etc/apt/sources.list.d/backports.list - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 - apt-get "${APT_TIMEOUT}" update || exit 1 - fi - apt-get "${APT_TIMEOUT}" -t buster-backports install gpsd -y || exit 1 - else - #We hope that the release is more recent than buster and provide gpsd 3.20 or > - apt-get "${APT_TIMEOUT}" install gpsd -y || exit 1 - fi #disable hotplug sed -i 's/^USBAUTO=.*/USBAUTO="false"/' /etc/default/gpsd #Setting correct input for gpsd diff --git a/web_app/requirements.txt b/web_app/requirements.txt index 6693875..ac559b3 100644 --- a/web_app/requirements.txt +++ b/web_app/requirements.txt @@ -2,27 +2,20 @@ bidict==0.22.1 blinker==1.6.3 Bootstrap-Flask==2.4.0 certifi==2024.2.2 -cffi==1.16.0;python_version>="3.8" -cffi==1.15.1;python_version<"3.8" +cffi==1.16.0 charset-normalizer==3.3.2 click==8.1.7 -cryptography==42.0.7;python_version>="3.8" -cryptography==41.0.5;python_version<"3.8" +cryptography==42.0.7 distro==1.8.0 -dnspython==2.6.1;python_version>="3.8" -dnspython==2.3.0;python_version<"3.8" -Flask==3.0.3;python_version>="3.8" -Flask==2.2.5;python_version<"3.8" -Flask-Login==0.6.3;python_version>="3.8" -Flask-Login==0.6.3;python_version<"3.8" +dnspython==2.6.1 +Flask==3.0.3 +Flask-Login==0.6.3 Flask-SocketIO==5.3.6 -Flask-WTF==1.2.1;python_version>="3.8" -Flask-WTF==1.1.1;python_version<"3.8" +Flask-WTF==1.2.1 gevent==24.2.1 gunicorn==22.0.0 h11==0.14.0 idna==3.7 -importlib-metadata==6.7.0;python_version<"3.8" itsdangerous==2.1.2 Jinja2==3.1.4 lxml==4.9.3 @@ -37,15 +30,10 @@ pyserial==3.5 pystemd==0.13.2 python-engineio==4.8.0 python-socketio==5.10.0 -requests==2.32.3;python_version>="3.8" -requests==2.31.0;python_version<"3.8" +requests==2.32.3 simple-websocket==1.0.0 six==1.16.0 -typing_extensions==4.7.1;python_version<"3.8" urllib3==2.0.7 -Werkzeug==3.0.3;python_version>="3.8" -Werkzeug==2.2.3;python_version<"3.8" +Werkzeug==3.0.3 wsproto==1.2.0 -WTForms==3.1.0;python_version>="3.8" -WTForms==3.0.1;python_version<"3.8" -zipp==3.15.0;python_version<"3.8" +WTForms==3.1.0