mnamer: 2.5.4 -> 2.5.5

+50 -47
+28
pkgs/by-name/mn/mnamer/cached_session_error.patch
··· 1 + From 94ea94de526770e783d04d75b981dfa3ac90fd20 Mon Sep 17 00:00:00 2001 2 + From: o7-machienhum <ryan.cjw@gmail.com> 3 + Date: Tue, 30 Jan 2024 03:29:09 -0800 4 + Subject: [PATCH] Fixes crash 5 + 6 + --- 7 + mnamer/utils.py | 3 --- 8 + 1 file changed, 3 deletions(-) 9 + 10 + diff --git a/mnamer/utils.py b/mnamer/utils.py 11 + index 84df7870..8eba68f8 100644 12 + --- a/mnamer/utils.py 13 + +++ b/mnamer/utils.py 14 + @@ -256,7 +256,6 @@ def request_json( 15 + "like Gecko) Chrome/79.0.3945.88 Safari/537.36" 16 + ) 17 + 18 + - initial_cache_state = session._disabled # yes, i'm a bad person 19 + try: 20 + session._disabled = not cache 21 + response = session.request( 22 + @@ -272,8 +271,6 @@ def request_json( 23 + except: 24 + content = None 25 + status = 500 26 + - finally: 27 + - session._disabled = initial_cache_state 28 + return status, (content or {})
+22 -13
pkgs/by-name/mn/mnamer/package.nix
··· 1 - { python3Packages, fetchFromGitHub, lib }: 1 + { 2 + python3Packages, 3 + fetchFromGitHub, 4 + lib, 5 + }: 2 6 3 7 python3Packages.buildPythonApplication rec { 4 8 pname = "mnamer"; 5 - version = "2.5.4"; 9 + version = "2.5.5"; 10 + format = "pyproject"; 6 11 7 12 src = fetchFromGitHub { 8 13 owner = "jkwill87"; 9 14 repo = "mnamer"; 10 - rev = version; 11 - sha256 = "sha256-fONQq/RboWHFuEFU7HP1ThUpSjOIlkg54c2WlMUKwuk="; 15 + tag = version; 16 + sha256 = "sha256-qQu5V1GOsbrR00HOrot6TTAkc3KRasBPDEU7ZojUBio="; 12 17 }; 13 18 14 - propagatedBuildInputs = with python3Packages; [ 19 + build-system = with python3Packages; [ 20 + setuptools 21 + setuptools-scm 22 + ]; 23 + 24 + dependencies = with python3Packages; [ 25 + appdirs 15 26 babelfish 27 + guessit 16 28 requests 17 - appdirs 29 + requests-cache 18 30 teletype 19 - requests-cache 20 - guessit 21 31 ]; 22 32 23 - patches = [ 24 - # requires specific old versions of dependencies which have been updated in nixpkgs 25 - ./remove_requirements.patch 33 + pythonRelaxDeps = true; 26 34 27 - # author reads a private property that changed between versions 28 - ./update_hack.patch 35 + patches = [ 36 + # https://github.com/jkwill87/mnamer/pull/291 37 + ./cached_session_error.patch 29 38 ]; 30 39 31 40 nativeCheckInputs = [ python3Packages.pytestCheckHook ];
-21
pkgs/by-name/mn/mnamer/remove_requirements.patch
··· 1 - diff --git a/setup.py b/setup.py 2 - index 245c1dd..fdc17ab 100755 3 - --- a/setup.py 4 - +++ b/setup.py 5 - @@ -7,16 +7,12 @@ from mnamer.__version__ import VERSION 6 - with open("readme.md", "r", encoding="utf8") as fp: 7 - LONG_DESCRIPTION = fp.read() 8 - 9 - -with open("requirements.txt", "r", encoding="utf8") as fp: 10 - - REQUIREMENTS = fp.read().splitlines() 11 - - 12 - setup( 13 - author="Jessy Williams", 14 - author_email="jessy@jessywilliams.com", 15 - description="A media file organiser", 16 - entry_points={"console_scripts": ["mnamer=mnamer.__main__:main"]}, 17 - include_package_data=True, 18 - - install_requires=REQUIREMENTS, 19 - license="MIT", 20 - long_description=LONG_DESCRIPTION, 21 - long_description_content_type="text/markdown",
-13
pkgs/by-name/mn/mnamer/update_hack.patch
··· 1 - diff --git a/mnamer/utils.py b/mnamer/utils.py 2 - index 636b596..e52bd37 100644 3 - --- a/mnamer/utils.py 4 - +++ b/mnamer/utils.py 5 - @@ -280,7 +280,7 @@ def request_json( 6 - "like Gecko) Chrome/79.0.3945.88 Safari/537.36" 7 - ) 8 - 9 - - initial_cache_state = session._is_cache_disabled # yes, i'm a bad person 10 - + initial_cache_state = session._disabled # yes, i'm a bad person 11 - try: 12 - session._is_cache_disabled = not cache 13 - response = session.request(