commit f7e5cf02720ed94bbeca84d291687619bc857812 · pyrox.dev/nixpkgs

+14 -21

pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch

···

       1
       1
        
       diff --git a/lib/youseedee/__init__.py b/lib/youseedee/__init__.py

     

       2
       2
       -
       index 8db9c5f..9ad6618 100644

     

       2
       2
       +
       index 5e73ef8..2cdbdd0 100644

     

       3
       3
        
       --- a/lib/youseedee/__init__.py

     

       4
       4
        
       +++ b/lib/youseedee/__init__.py

     

       5
       5
       -
       @@ -38,12 +38,7 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip"

     

       5
       5
       +
       @@ -38,19 +38,12 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip"

     

       6
       6
        
        

     

       7
       7
        
        def ucd_dir():

     

       8
       8
        
            """Return the directory where Unicode data is stored"""

     

       9
       9
       -
       -    ucddir = expanduser("~/.youseedee")

     

       10
       10
       -
       -    try:

     

       11
       11
       -
       -        os.mkdir(ucddir)

     

       12
       12
       -
       -    except FileExistsError:

     

       13
       13
       -
       -        pass

     

       14
       14
       -
       -    return ucddir

     

       15
       15
       -
       +    return "@ucd_dir@"

     

       9
       9
       +
       -    return Path(platformdirs.user_cache_dir("youseedee", ensure_exists=True))

     

       10
       10
       +
       +    return Path("@ucd_dir@")

     

       16
       11
        
        

     

       17
       12
        
        

     

       18
       18
       -
        def up_to_date():

     

       19
       19
       -
       @@ -65,14 +60,6 @@ def up_to_date():

     

       20
       20
       -
        

     

       21
       13
        
        def ensure_files():

     

       22
       14
        
            """Ensure the Unicode data files are downloaded and up to date, and download them if not"""

     

       23
       23
       -
       -    if not os.path.isfile(os.path.join(ucd_dir(), "UnicodeData.txt")):

     

       24
       24
       -
       -        download_files()

     

       25
       25
       -
       -    if not up_to_date():

     

       26
       26
       -
       -        # Remove the zip if it exists

     

       27
       27
       -
       -        zip_path = os.path.join(ucd_dir(), "UCD.zip")

     

       28
       28
       -
       -        if os.path.isfile(zip_path):

     

       29
       29
       -
       -            os.unlink(zip_path)

     

       30
       30
       -
       -        download_files()

     

       31
       31
       -
            return

     

       15
       15
       +
       -    file_lock = FileLock(ucd_dir() / ".youseedee_ensure_files.lock")

     

       16
       16
       +
       -    with file_lock:

     

       17
       17
       +
       -        if not (ucd_dir() / "UnicodeData.txt").is_file():

     

       18
       18
       +
       -            _download_files()

     

       19
       19
       +
       -        if not _up_to_date():

     

       20
       20
       +
       -            # Remove the zip if it exists

     

       21
       21
       +
       -            (ucd_dir() / "UCD.zip").unlink(missing_ok=True)

     

       22
       22
       +
       -            _download_files()

     

       23
       23
       +
       +    return

     

       32
       24
        
        

     

       33
       25
        
        

     

       26
       26
       +
        def _up_to_date():

+4 -2

pkgs/development/python-modules/youseedee/default.nix

···

       7
       7
        
         setuptools-scm,

     

       8
       8
        
         filelock,

     

       9
       9
        
         requests,

     

       10
       10
       +
         platformdirs,

     

       10
       11
        
         unicode-character-database,

     

       11
       12
        
       }:

     

       12
       13
        
       

     

       13
       14
        
       buildPythonPackage rec {

     

       14
       15
        
         pname = "youseedee";

     

       15
       15
       -
         version = "0.6.0";

     

       16
       16
       +
         version = "0.7.0";

     

       16
       17
        
         pyproject = true;

     

       17
       18
        
       

     

       18
       19
        
         src = fetchPypi {

     

       19
       20
        
           inherit pname version;

     

       20
       20
       -
           hash = "sha256-9w6yr28zq0LgOvMp5fCFaHGOwK4wbbDo/g1jH4Uky0E=";

     

       21
       21
       +
           hash = "sha256-b5gxBIr/mowzlG4/N0C22S1XTq0NAGTq1/+iMUfxD18=";

     

       21
       22
        
         };

     

       22
       23
        
       

     

       23
       24
        
         patches = [

     
···

       36
       37
        
         dependencies = [

     

       37
       38
        
           filelock

     

       38
       39
        
           requests

     

       40
       40
       +
           platformdirs

     

       39
       41
        
         ];

     

       40
       42
        
       

     

       41
       43
        
         # Package has no unit tests, but we can check an example as per README.rst: