Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SickChill update to fix v3 install errors #4964

Merged
merged 4 commits into from
Nov 17, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cross/sickchill/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PKG_NAME = SickChill
PKG_VERS = 2021.07.29
PKG_VERS = 2021.11.10
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/SickChill/SickChill/archive/refs/tags
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

SC_GIT_BRANCH=master
SC_GIT_COMMIT_HASH=5f63ed027cd80bd85604885d67d3fef3e40f42c9
SC_GIT_COMMIT_HASH=01020f3636d01535f60b83464d8127ea0efabfc7
SC_GIT_COMMIT_BRANCH=$(PKG_VERS)

DEPENDS =
Expand Down
6 changes: 3 additions & 3 deletions cross/sickchill/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021.07.29.tar.gz SHA1 ba45339c4fc52226639ba63027f923b1e005d96f
2021.07.29.tar.gz SHA256 fb35b9f19fa4c862b49375af4acd6ff1afa0f88e100b8b34bfa6d0df8176fd55
2021.07.29.tar.gz MD5 b75efe45cad979a445feffc6f2009a6e
2021.11.10.tar.gz SHA1 4a2e8be611beb58d111137cca6ebe818581c4ea0
2021.11.10.tar.gz SHA256 d0fbe56b6e1bc4e99857b4266236de168b012184449703f3009807fe40484d95
2021.11.10.tar.gz MD5 8e31cd4fc3ce70435d20916d34ce1cf2
33 changes: 0 additions & 33 deletions cross/sickchill/patches/01-fix-python3.8.patch

This file was deleted.

8 changes: 4 additions & 4 deletions spk/sickchill/Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
SPK_NAME = sickchill
SPK_VERS = 20210729
SPK_REV = 3
SPK_VERS = 20211110
SPK_REV = 4
SPK_ICON = src/sickchill.png

BUILD_DEPENDS = cross/python38 cross/setuptools cross/pip cross/wheel cross/poetry cross/lxml
# cross/cffi cross/setuptools cross/cryptography cross/poetry
DEPENDS = cross/PyNaCl cross/$(SPK_NAME)
SPK_DEPENDS = "python38"
SPK_DEPENDS = "python38>=3.8.12-6"

WHEELS = src/requirements-cross.txt src/requirements.txt

MAINTAINER = miigotu
DESCRIPTION = Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
STARTABLE = yes
DISPLAY_NAME = SickChill
CHANGELOG = "1. SickChill environment fix<br/>2. Move to Python 3.8 without git<br/>3. Added DSM7 Support"
CHANGELOG = "1. SickChill environment fix<br/>2. Move to Python 3.8 without git<br/>3. Added DSM7 Support<br/>4. cryptography resolution for armv7"

HOMEPAGE = https://sickchill.github.io/
LICENSE = GPLv3+
Expand Down
3 changes: 2 additions & 1 deletion spk/sickchill/src/requirements-cross.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ chardet==4.0.0
click==8.0.3
###cryptography==3.4.7
future==0.18.2
greenlet==1.1.2
###py38 greenlet==1.1.2
###importlib-metadata==1.7.0
kodipydent-alt==2021.7.16
###py38 lxml==4.6.3
Expand All @@ -14,3 +14,4 @@ sgmllib3k==1.0.0
SQLAlchemy==1.4.26 #py38
wrapt==1.13.3
###python-dateutil==2.8.2
backports.zoneinfo==0.2.1
8 changes: 4 additions & 4 deletions spk/sickchill/src/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###poetry adds with removal of cross/poetry
poetry==1.2.0a2
poetry-core==1.1.0a6
poetry-date-version-plugin==2021.7.16-6
###poetry==1.2.0a2
###poetry-core==1.1.0a6
###poetry-date-version-plugin==2021.7.16-6
###py38 appdirs==1.4.4
babelfish==0.6.0
beautifulsoup4==4.10.0
Expand Down Expand Up @@ -80,4 +80,4 @@ validators==0.18.2
webencodings==0.5.1
win-inet-pton==1.1.0
xmltodict==0.12.0
zipp==3.6.0
###py38 zipp==3.6.0
6 changes: 4 additions & 2 deletions spk/sickchill/src/service-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ service_postupgrade() {
service_preupgrade ()
{
# We have to reset /env folder to 3.8 so remove entire folder as it gets rebuilt in postinst and this avoids any conflicts.
# Revision 1 was running python 3.7
# Revision 1 was python 3.7. For cleaner update remove share and lib folders for clean install, leave user data /var.
if [ "${SYNOPKG_PKG_STATUS}" != "INSTALL" ] && [ "$(echo ${SYNOPKG_OLD_PKGVER} | sed -r 's/^.*-([0-9]+)$/\1/')" -le 1 ]; then
echo "Removing old ${SYNOPKG_PKGDEST}/env for new Python 3.8"
echo "Removing old ${SYNOPKG_PKGDEST}/env and /share for new Python 3.8 and old install"
rm -rf ${SYNOPKG_PKGDEST}/env
rm -rf ${SYNOPKG_PKGDEST}/share
rm -rf ${SYNOPKG_PKGDEST}/lib
fi
}