Commit 63dd97dd authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.58'

parents 93bf0343 2a2d5142
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
   
All notable changes to this project will be documented in this file. Dates are displayed in UTC. All notable changes to this project will be documented in this file. Dates are displayed in UTC.
   
#### [10.0.58](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.57...10.0.58)
- added python version constraints for importlib-metadata in requirements.txt [`df671c9`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/df671c986d78ff7555acf5836736c754df971c10)
#### [10.0.57](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.56...10.0.57) #### [10.0.57](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.56...10.0.57)
   
> 22 March 2022
#### [10.0.56](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.55...10.0.56) #### [10.0.56](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.55...10.0.56)
   
> 20 March 2022 > 20 March 2022
......
{ {
"name": "sickrage", "name": "sickrage",
"version": "10.0.57", "version": "10.0.58",
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",
......
...@@ -36,7 +36,8 @@ hachoir==3.1.1 ...@@ -36,7 +36,8 @@ hachoir==3.1.1
html5lib==1.1 html5lib==1.1
httplib2==0.18.1 httplib2==0.18.1
idna==2.10 idna==2.10
importlib-metadata==4.11.3 importlib-metadata==4.11.3; python_version >= '3.7'
importlib-metadata==4.8.3; python_version == '3.6'
ipaddress==1.0.23 ipaddress==1.0.23
knowit==0.2.4 knowit==0.2.4
lockfile==0.12.2 lockfile==0.12.2
......
[bumpversion] [bumpversion]
current_version = 10.0.57 current_version = 10.0.58
commit = False commit = False
tag = False tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>. # along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ############################################################################## # ##############################################################################
__version__ = "10.0.57" __version__ = "10.0.58"
__install_type__ = "" __install_type__ = ""
import argparse import argparse
...@@ -27,6 +27,7 @@ import atexit ...@@ -27,6 +27,7 @@ import atexit
import gettext import gettext
import os import os
import pathlib import pathlib
import re
import site import site
import subprocess import subprocess
import sys import sys
...@@ -187,7 +188,16 @@ def check_requirements(): ...@@ -187,7 +188,16 @@ def check_requirements():
with open(REQS_FILE) as f: with open(REQS_FILE) as f:
for line in f.readlines(): for line in f.readlines():
try: try:
req_name, req_version = line.strip().split('==') req_name, req_version = line.strip().split('==', 1)
if 'python_version' in req_version:
m = re.search('(\d+.\d+.\d+).*(\d+.\d+)', req_version)
req_version = m.group(1)
python_version = m.group(2)
python_version_major = int(python_version.split('.')[0])
python_version_minor = int(python_version.split('.')[1])
if sys.version_info.major == python_version_major and sys.version_info.minor != python_version_minor:
continue
if not pkg_resources.get_distribution(req_name).version == req_version: if not pkg_resources.get_distribution(req_name).version == req_version:
print('Updating requirement {} to {}'.format(req_name, req_version)) print('Updating requirement {} to {}'.format(req_name, req_version))
subprocess.check_call([sys.executable, "-m", "pip", "install", "--no-deps", "--no-cache-dir", line.strip()]) subprocess.check_call([sys.executable, "-m", "pip", "install", "--no-deps", "--no-cache-dir", line.strip()])
......
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/__init__.py = e50def29378217d46cf746169ee20390 sickrage/__init__.py = 0bed6cc5df0668f540a447f4acfda85e
sickrage/version.txt = d19c691b505b8dc2c59bb8410e12ebb2 sickrage/version.txt = 19ffc092084e6b8f2c52f6dd9061c331
sickrage/clients/__init__.py = abafc862109398700c9fee676cdeef6b sickrage/clients/__init__.py = abafc862109398700c9fee676cdeef6b
sickrage/clients/nzb/nzbget.py = 2a23083d4915fed22c73f4966588cac8 sickrage/clients/nzb/nzbget.py = 2a23083d4915fed22c73f4966588cac8
sickrage/clients/nzb/sabnzbd.py = f76666e47017abaf366f4a3e8b71c47b sickrage/clients/nzb/sabnzbd.py = f76666e47017abaf366f4a3e8b71c47b
...@@ -433,7 +433,7 @@ sickrage/core/webserver/static/images/backdrops/config.jpg = ddbe8915317f7860d91 ...@@ -433,7 +433,7 @@ sickrage/core/webserver/static/images/backdrops/config.jpg = ddbe8915317f7860d91
sickrage/core/webserver/static/images/backdrops/home.jpg = 804dfc976638bbf45df310a3627e2d5c sickrage/core/webserver/static/images/backdrops/home.jpg = 804dfc976638bbf45df310a3627e2d5c
sickrage/core/webserver/static/images/backdrops/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015 sickrage/core/webserver/static/images/backdrops/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015
sickrage/core/webserver/static/images/backdrops/history.jpg = b4911bfe3ec57a894b5a16fa1ab479cf sickrage/core/webserver/static/images/backdrops/history.jpg = b4911bfe3ec57a894b5a16fa1ab479cf
sickrage/core/webserver/static/js/core.min.js = e66d6b18d52d9011551625f718623c92 sickrage/core/webserver/static/js/core.min.js = 80253d4981adca99b7a155818b2ca814
sickrage/core/webserver/static/js/core.js.map = cdf19c1422438fb68dd84471031b2c56 sickrage/core/webserver/static/js/core.js.map = cdf19c1422438fb68dd84471031b2c56
sickrage/core/webserver/views/login.mako = 3f6c8e8325928539d6bb70a77b378116 sickrage/core/webserver/views/login.mako = 3f6c8e8325928539d6bb70a77b378116
sickrage/core/webserver/views/login_failed.mako = 5684d10edff37970a2285d7d5bb815eb sickrage/core/webserver/views/login_failed.mako = 5684d10edff37970a2285d7d5bb815eb
......
...@@ -81729,7 +81729,7 @@ var debugs = {}; ...@@ -81729,7 +81729,7 @@ var debugs = {};
var debugEnviron; var debugEnviron;
exports.debuglog = function(set) { exports.debuglog = function(set) {
if (isUndefined(debugEnviron)) if (isUndefined(debugEnviron))
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.57"}).NODE_DEBUG || ''; debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.58"}).NODE_DEBUG || '';
set = set.toUpperCase(); set = set.toUpperCase();
if (!debugs[set]) { if (!debugs[set]) {
if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) { if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
...@@ -82538,7 +82538,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de ...@@ -82538,7 +82538,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   
Sentry.init({ Sentry.init({
dsn: 'https://[email protected]/2', dsn: 'https://[email protected]/2',
release: "10.0.57", release: "10.0.58",
beforeSend: function beforeSend(event, hint) { beforeSend: function beforeSend(event, hint) {
if (event.exception) { if (event.exception) {
event.exception.values[0].stacktrace.frames.forEach(function (frame) { event.exception.values[0].stacktrace.frames.forEach(function (frame) {
10.0.57 10.0.58
\ No newline at end of file \ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment