Skip to content

Commit

Permalink
Merge pull request #11534 from pymedusa/release/release-1.0.18
Browse files Browse the repository at this point in the history
Release/release 1.0.18
  • Loading branch information
medariox committed Oct 29, 2023
2 parents 3d65665 + b9c6302 commit b8bec48
Show file tree
Hide file tree
Showing 34 changed files with 672 additions and 401 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## 1.0.18 (29-10-2023)

#### Improvements
- Update some JS and Python dependencies
- Add a few new logos (Thanks to @purevertigo)
- Update Yggtorrent domain (Thanks to @cpainchaud)

#### Fixes
- Don't overwrite manual post-processing delete preference
- Fix color of show-header in light theme (Thanks to @cheese1)

-----

## 1.0.17 (29-06-2023)

#### New Features
Expand Down
2 changes: 1 addition & 1 deletion ext/certifi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .core import contents, where

__all__ = ["contents", "where"]
__version__ = "2022.12.07"
__version__ = "2023.07.22"
386 changes: 247 additions & 139 deletions ext/certifi/cacert.pem

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ext/urllib3/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is protected via CODEOWNERS
__version__ = "1.26.16"
__version__ = "1.26.17"
21 changes: 21 additions & 0 deletions ext/urllib3/request.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
from __future__ import absolute_import

import sys

from .filepost import encode_multipart_formdata
from .packages import six
from .packages.six.moves.urllib.parse import urlencode

__all__ = ["RequestMethods"]
Expand Down Expand Up @@ -168,3 +171,21 @@ def request_encode_body(
extra_kw.update(urlopen_kw)

return self.urlopen(method, url, **extra_kw)


if not six.PY2:

class RequestModule(sys.modules[__name__].__class__):
def __call__(self, *args, **kwargs):
"""
If user tries to call this module directly urllib3 v2.x style raise an error to the user
suggesting they may need urllib3 v2
"""
raise TypeError(
"'module' object is not callable\n"
"urllib3.request() method is not supported in this release, "
"upgrade to urllib3 v2 to use it\n"
"see https://urllib3.readthedocs.io/en/stable/v2-migration-guide.html"
)

sys.modules[__name__].__class__ = RequestModule
2 changes: 1 addition & 1 deletion ext/urllib3/util/retry.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class Retry(object):
RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])

#: Default headers to be used for ``remove_headers_on_redirect``
DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Authorization"])
DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])

#: Maximum backoff time.
DEFAULT_BACKOFF_MAX = 120
Expand Down
2 changes: 1 addition & 1 deletion medusa/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
log.logger.addHandler(logging.NullHandler())

INSTANCE_ID = text_type(uuid.uuid1())
VERSION = '1.0.17'
VERSION = '1.0.18'

USER_AGENT = 'Medusa/{version} ({system}; {release}; {instance})'.format(
version=VERSION, system=platform.system(), release=platform.release(),
Expand Down
2 changes: 1 addition & 1 deletion medusa/process_tv.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ def _clean_up(self, path, proc_type, delete=False):
if self.unwanted_files:
self.delete_files(path, self.unwanted_files)

if not app.NO_DELETE or clean_folder:
if (proc_type != 'manual' and not app.NO_DELETE) or clean_folder:
check_empty = False if clean_folder else True
if self.delete_folder(path, check_empty=check_empty):
self.log_and_output('Deleted folder: {path}', level=logging.DEBUG, **{'path': path})
Expand Down
2 changes: 1 addition & 1 deletion medusa/providers/torrent/html/yggtorrent.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(self):
self.password = None

# URLs
self.url = 'https://yggtorrent.do'
self.url = 'https://yggtorrent.wtf'
self.urls = {
'auth': urljoin(self.url, 'user/ajax_usermenu'),
'login': urljoin(self.url, 'user/login'),
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ babelfish==0.6.0
beautifulsoup4==4.12.2
bencode.py==4.0.0
CacheControl==0.13.1
certifi==2022.12.7
certifi==2023.7.22
cloudscraper==1.2.70
configobj==5.0.8
contextlib2==21.6.0
Expand Down Expand Up @@ -38,5 +38,5 @@ tornado==6.1
tornroutes==0.5.1
ttl-cache==1.6
tvdbapiv2 @ https://codeload.github.com/pymedusa/tvdbv2/tar.gz/d6d0e9d98071c2d646beb997b336edbb0e98dfb7
urllib3==1.26.16
urllib3==1.26.17
validators==0.20.0
2 changes: 1 addition & 1 deletion test_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pytest>=6.2.5
pytest-cov==4.1.0
pytest-flake8==1.1.1
pytest-tornado==0.8.1
PyYAML==5.4.1
PyYAML==6.0.1
six==1.16.0
tornado==6.1
urllib3<2.0.0
Expand Down
24 changes: 12 additions & 12 deletions themes-default/slim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
]
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "1.2.36",
"@fortawesome/free-regular-svg-icons": "5.15.4",
"@fortawesome/free-solid-svg-icons": "5.15.4",
"@fortawesome/vue-fontawesome": "2.0.10",
"@fortawesome/fontawesome-svg-core": "6.4.0",
"@fortawesome/free-regular-svg-icons": "6.4.0",
"@fortawesome/free-solid-svg-icons": "6.4.0",
"@fortawesome/vue-fontawesome": "latest-2",
"@johmun/vue-tags-input": "2.1.0",
"axios": "0.27.2",
"bootstrap": "3.4.1",
Expand Down Expand Up @@ -71,17 +71,17 @@
"vuex": "3.6.2"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/eslint-parser": "7.22.5",
"@babel/plugin-transform-runtime": "7.22.5",
"@babel/preset-env": "7.22.5",
"@babel/runtime": "7.22.5",
"@babel/core": "7.22.8",
"@babel/eslint-parser": "7.22.7",
"@babel/plugin-transform-runtime": "7.22.7",
"@babel/preset-env": "7.22.7",
"@babel/runtime": "7.22.6",
"@mapbox/stylelint-processor-arbitrary-tags": "0.4.0",
"@sharkykh/eslint-plugin-vue-extra": "0.1.1",
"@testing-library/jest-dom": "5.11.9",
"@vue/test-utils": "1.3.6",
"babel-core": "7.0.0-bridge.0",
"babel-loader": "9.1.2",
"babel-loader": "9.1.3",
"browser-env": "3.3.0",
"clean-webpack-plugin": "4.0.0",
"codecov": "3.8.3",
Expand All @@ -99,7 +99,7 @@
"eslint-plugin-vue": "7.20.0",
"file-loader": "6.2.0",
"filemanager-webpack-plugin": "8.0.0",
"glob": "10.3.0",
"glob": "10.3.3",
"gulp": "4.0.2",
"gulp-changed": "4.0.3",
"gulp-imagemin": "7.1.0",
Expand All @@ -115,7 +115,7 @@
"timekeeper": "2.2.0",
"vue-jest": "3.0.7",
"vue-loader": "15.10.1",
"webpack": "5.88.0",
"webpack": "5.88.1",
"webpack-cli": "5.1.4"
},
"stylelint": {
Expand Down
3 changes: 3 additions & 0 deletions themes-default/slim/static/css/light.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ home.mako
/* =======================================================================
displayShow.mako
========================================================================== */
.snatchTitle {
color: rgb(0, 0, 0) !important;
}

.displayShowTable th.row-seasonheader {
border: none !important;
Expand Down
Binary file modified themes-default/slim/static/images/network/amc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified themes-default/slim/static/images/network/max.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b8bec48

Please sign in to comment.