diff --git a/ctl b/ctl index d378bc8c..07e8380a 100755 --- a/ctl +++ b/ctl @@ -39,7 +39,9 @@ if [ "$action" = "init" ]; then $SUDO git clone -b $branch https://git.0x2620.org/${package}.git src/${package} fi cd ${BASE}/src/${package} - $SUDO ${BASE}/bin/python setup.py develop + + $SUDO ${BASE}/bin/pip install -e . + done cd ${BASE} $SUDO ./bin/pip install -r requirements.txt @@ -50,6 +52,10 @@ if [ "$action" = "init" ]; then done exit 0 fi +if [ "$action" = "version" ]; then + git rev-list HEAD --count + exit 0 +fi if [ "$action" = "manage" ]; then cmd="pandora/manage.py" diff --git a/docker/base/install.sh b/docker/base/install.sh index b056c00d..c344d74c 100755 --- a/docker/base/install.sh +++ b/docker/base/install.sh @@ -52,7 +52,6 @@ apt-get install -y \ python3-numpy \ python3-psycopg2 \ python3-pyinotify \ - python3-simplejson \ python3-lxml \ python3-cssselect \ python3-html5lib \ diff --git a/pandora/archive/models.py b/pandora/archive/models.py index c87df69d..e5f0a1e6 100644 --- a/pandora/archive/models.py +++ b/pandora/archive/models.py @@ -818,6 +818,7 @@ class Stream(models.Model): self.file.save() self.available = True self.save() + done = True elif self.file.can_remux(): ok, error = extract.remux_stream(media, target) done = True diff --git a/requirements.txt b/requirements.txt index ddc241e5..b1ef09f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ -Django==4.2.3 -simplejson +Django==4.2.7 chardet -celery==5.3.1 +celery==5.3.5 django-celery-results==2.5.1 django-celery-beat==2.5.0 django-extensions==3.2.3 @@ -12,9 +11,9 @@ gunicorn==20.0.4 html5lib requests<3.0.0,>=2.24.0 urllib3<2.0.0,>=1.25.2 -tornado==6.3.2 -geoip2==4.1.0 -yt-dlp>=2022.3.8.2 +tornado==6.3.3 +geoip2==4.7.0 +yt-dlp>=2023.11.16 python-memcached elasticsearch<8 future diff --git a/update.py b/update.py index 06d9767d..1561636c 100755 --- a/update.py +++ b/update.py @@ -299,7 +299,7 @@ if __name__ == "__main__": run(join(base, 'pandora/manage.py'), 'update_geoip') if old < 6442: run('./bin/pip', 'install', 'yt-dlp>=2022.3.8.2') - if old <= 6517: + if old <= 6581: run('./bin/pip', 'install', '-U', 'pip') run('./bin/pip', 'install', '-r', 'requirements.txt') else: diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh index bda61bbe..cef8bd86 100755 --- a/vm/pandora_install.sh +++ b/vm/pandora_install.sh @@ -111,7 +111,6 @@ apt-get install -y \ python3-numpy \ python3-psycopg2 \ python3-pyinotify \ - python3-simplejson \ python3-maxminddb \ libmaxminddb-dev \ python3-lxml \