commit 4509e75a53a8f20869fd803a28c5c20274f5610f · pyrox.dev/nixpkgs

+5 -2

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

···

       4
       4
        
         fetchPypi,

     

       5
       5
        
         setuptools,

     

       6
       6
        
         setuptools-scm,

     

       7
       7
       -
         setuptools-git,

     

       8
       7
        
         numpy,

     

       9
       8
        
         pandas,

     

       10
       9
        
         bokeh,

     
···

       20
       19
        
           hash = "sha256-c4od7ij8U98u2jXqLy0aHDfdugHfFCI/yeh9gKHvvC4=";

     

       21
       20
        
         };

     

       22
       21
        
       

     

       22
       22
       +
         postPatch = ''

     

       23
       23
       +
           substituteInPlace setup.py \

     

       24
       24
       +
             --replace-fail "'setuptools_git'," ""

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       23
       27
        
         build-system = [

     

       24
       28
        
           setuptools

     

       25
       29
        
           setuptools-scm

     

       26
       26
       -
           setuptools-git

     

       27
       30
        
         ];

     

       28
       31
        
       

     

       29
       32
        
         dependencies = [

+5 -2

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

···

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchPypi,

     

       5
       5
        
         setuptools,

     

       6
       6
       -
         setuptools-git,

     

       7
       6
        
         numpy,

     

       8
       7
        
         pillow,

     

       9
       8
        
         pytestCheckHook,

     
···

       18
       17
        
           hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas=";

     

       19
       18
        
         };

     

       20
       19
        
       

     

       20
       20
       +
         postPatch = ''

     

       21
       21
       +
           substituteInPlace setup.cfg \

     

       22
       22
       +
             --replace-fail "setup_requires = setuptools_git" ""

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       21
       25
        
         build-system = [

     

       22
       26
        
           setuptools

     

       23
       23
       -
           setuptools-git

     

       24
       27
        
         ];

     

       25
       28
        
       

     

       26
       29
        
         dependencies = [

+8 -7

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         pythonOlder,

     

       6
       5
        
         mako,

     

       7
       6
        
         markdown,

     

       8
       8
       -
         setuptools-git,

     

       9
       7
        
         setuptools-scm,

     

       10
       8
        
         unittestCheckHook,

     

       11
       9
        
       }:

     

       12
       10
        
       

     

       13
       11
        
       buildPythonPackage rec {

     

       14
       12
        
         pname = "pdoc3";

     

       15
       15
       -
         version = "0.11.1";

     

       13
       13
       +
         version = "0.11.6";

     

       16
       14
        
         pyproject = true;

     

       17
       17
       -
         disabled = pythonOlder "3.9";

     

       18
       15
        
       

     

       19
       16
        
         src = fetchFromGitHub {

     

       20
       17
        
           owner = "pdoc3";

     

       21
       18
        
           repo = "pdoc";

     

       22
       19
        
           tag = version;

     

       23
       23
       -
           hash = "sha256-Opj1fU1eZvqsYJGCBliVwugxFV4H1hzOOTkjs4fOEWA=";

     

       20
       20
       +
           hash = "sha256-I8EPsjwA9dHOLvM2Oa4dbtB0N4dVczeGfzk+BVyfBcQ=";

     

       24
       21
        
         };

     

       25
       22
        
       

     

       23
       23
       +
         postPatch = ''

     

       24
       24
       +
           substituteInPlace setup.py \

     

       25
       25
       +
             --replace-fail "'setuptools_git'," ""

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       26
       28
        
         build-system = [

     

       27
       27
       -
           setuptools-git

     

       28
       29
        
           setuptools-scm

     

       29
       30
        
         ];

     

       30
       31
        
       

     
···

       38
       39
        
         nativeCheckInputs = [ unittestCheckHook ];

     

       39
       40
        
       

     

       40
       41
        
         meta = {

     

       41
       41
       -
           changelog = "https://github.com/pdoc3/pdoc/blob/${src.rev}/CHANGELOG";

     

       42
       42
       +
           changelog = "https://github.com/pdoc3/pdoc/blob/${src.tag}/CHANGELOG";

     

       42
       43
        
           description = "Auto-generate API documentation for Python projects";

     

       43
       44
        
           homepage = "https://pdoc3.github.io/pdoc/";

     

       44
       45
        
           license = lib.licenses.agpl3Plus;

+5 -4

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

···

       7
       7
        
         pip,

     

       8
       8
        
         pytestCheckHook,

     

       9
       9
        
         pythonOlder,

     

       10
       10
       -
         setuptools-git,

     

       11
       10
        
         setuptools,

     

       12
       11
        
         twine,

     

       13
       12
        
         watchdog,

     

       14
       13
        
         webtest,

     

       15
       15
       -
         wheel,

     

       16
       14
        
         build,

     

       17
       15
        
         importlib-resources,

     

       18
       16
        
       }:

     
···

       31
       29
        
           hash = "sha256-ODwDYAEAqel31+kR/BE1yBfgOZOtPz3iaCLg/d6jbb4=";

     

       32
       30
        
         };

     

       33
       31
        
       

     

       32
       32
       +
         postPatch = ''

     

       33
       33
       +
           substituteInPlace setup.py \

     

       34
       34
       +
             --replace-fail '"setuptools-git>=0.3",' ""

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       34
       37
        
         build-system = [

     

       35
       38
        
           setuptools

     

       36
       36
       -
           setuptools-git

     

       37
       37
       -
           wheel

     

       38
       39
        
         ];

     

       39
       40
        
       

     

       40
       41
        
         dependencies = [

+7 -4

pkgs/development/python-modules/pytest-fixture-config/default.nix

···

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         setuptools,

     

       6
       6
       -
         setuptools-git,

     

       7
       6
        
         pytest,

     

       7
       7
       +
         pytestCheckHook,

     

       8
       8
       +
         six,

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       buildPythonPackage rec {

     
···

       23
       24
        
           cd pytest-fixture-config

     

       24
       25
        
         '';

     

       25
       26
        
       

     

       26
       26
       -
         nativeBuildInputs = [

     

       27
       27
       +
         build-system = [

     

       27
       28
        
           setuptools

     

       28
       28
       -
           setuptools-git

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [ pytest ];

     

       32
       32
        
       

     

       33
       33
       -
         doCheck = false;

     

       33
       33
       +
         nativeCheckInputs = [

     

       34
       34
       +
           pytestCheckHook

     

       35
       35
       +
           six

     

       36
       36
       +
         ];

     

       34
       37
        
       

     

       35
       38
        
         meta = with lib; {

     

       36
       39
        
           changelog = "https://github.com/man-group/pytest-plugins/blob/${src.tag}/CHANGES.md";

+1 -10

pkgs/development/python-modules/pytest-shutil/default.nix

···

       6
       6
        
       

     

       7
       7
        
         # build-time

     

       8
       8
        
         setuptools,

     

       9
       9
       -
         setuptools-git,

     

       10
       9
        
       

     

       11
       10
        
         # runtime

     

       12
       11
        
         pytest,

     

       13
       13
       -
         mock,

     

       14
       14
       -
         path,

     

       15
       12
        
         execnet,

     

       16
       13
        
         termcolor,

     

       17
       14
        
         six,

     
···

       31
       28
        
       

     

       32
       29
        
         build-system = [

     

       33
       30
        
           setuptools

     

       34
       34
       -
           setuptools-git

     

       35
       31
        
         ];

     

       36
       32
        
       

     

       37
       33
        
         buildInputs = [ pytest ];

     

       38
       34
        
       

     

       39
       35
        
         dependencies = [

     

       40
       40
       -
           mock

     

       41
       41
       -
           path

     

       42
       36
        
           execnet

     

       43
       37
        
           termcolor

     

       44
       38
        
           six

     
···

       46
       40
        
       

     

       47
       41
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       48
       42
        
       

     

       49
       49
       -
         disabledTests = [

     

       50
       50
       -
           "test_pretty_formatter"

     

       51
       51
       -
         ]

     

       52
       52
       -
         ++ lib.optionals isPyPy [

     

       43
       43
       +
         disabledTests = lib.optionals isPyPy [

     

       53
       44
        
           "test_run"

     

       54
       45
        
           "test_run_integration"

     

       55
       46
        
         ];

+21 -10

pkgs/development/python-modules/setuptools-git/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         pkgs,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         gitMinimal,

     

       6
       6
       +
         replaceVars,

     

       7
       7
       +
         setuptools,

     

       6
       8
        
       }:

     

       7
       9
        
       

     

       8
       10
        
       buildPythonPackage rec {

     

       9
       11
        
         pname = "setuptools-git";

     

       10
       12
        
         version = "1.2";

     

       11
       11
       -
         format = "setuptools";

     

       13
       13
       +
         pyproject = true;

     

       12
       14
        
       

     

       13
       13
       -
         src = fetchPypi {

     

       14
       14
       -
           inherit pname version;

     

       15
       15
       -
           sha256 = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445";

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "msabramo";

     

       17
       17
       +
           repo = "setuptools-git";

     

       18
       18
       +
           tag = version;

     

       19
       19
       +
           hash = "sha256-dbQ15y62nanuWgh2puLYSio391Ja3SF+HrafvTBVNbk=";

     

       16
       20
        
         };

     

       17
       21
        
       

     

       18
       18
       -
         propagatedBuildInputs = [ pkgs.git ];

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           (replaceVars ./hardcode-git-path.patch {

     

       24
       24
       +
             git = lib.getExe gitMinimal;

     

       25
       25
       +
           })

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         build-system = [ setuptools ];

     

       29
       29
       +
       

     

       19
       30
        
         doCheck = false;

     

       20
       31
        
       

     

       21
       21
       -
         meta = with lib; {

     

       32
       32
       +
         meta = {

     

       22
       33
        
           description = "Setuptools revision control system plugin for Git";

     

       23
       23
       -
           homepage = "https://pypi.python.org/pypi/setuptools-git";

     

       24
       24
       -
           license = licenses.bsd3;

     

       34
       34
       +
           homepage = "https://github.com/msabramo/setuptools-git";

     

       35
       35
       +
           license = lib.licenses.bsd3;

     

       25
       36
        
         };

     

       26
       37
        
       }

+31

pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch

···

       1
       1
       +
       diff --git a/setuptools_git/__init__.py b/setuptools_git/__init__.py

     

       2
       2
       +
       index 24c9b8c..a289aca 100644

     

       3
       3
       +
       --- a/setuptools_git/__init__.py

     

       4
       4
       +
       +++ b/setuptools_git/__init__.py

     

       5
       5
       +
       @@ -28,7 +28,7 @@ def version_calc(dist, attr, value):

     

       6
       6
       +
        

     

       7
       7
       +
        

     

       8
       8
       +
        def calculate_version():

     

       9
       9
       +
       -    return check_output(['git', 'describe', '--tags', '--dirty']).strip()

     

       10
       10
       +
       +    return check_output(['@git@', 'describe', '--tags', '--dirty']).strip()

     

       11
       11
       +
        

     

       12
       12
       +
        

     

       13
       13
       +
        def ntfsdecode(path):

     

       14
       14
       +
       @@ -64,7 +64,7 @@ def gitlsfiles(dirname=''):

     

       15
       15
       +
        

     

       16
       16
       +
            try:

     

       17
       17
       +
                topdir = check_output(

     

       18
       18
       +
       -            ['git', 'rev-parse', '--show-toplevel'], cwd=dirname or None,

     

       19
       19
       +
       +            ['@git@', 'rev-parse', '--show-toplevel'], cwd=dirname or None,

     

       20
       20
       +
                    stderr=PIPE).strip()

     

       21
       21
       +
        

     

       22
       22
       +
                if sys.platform == 'win32':

     

       23
       23
       +
       @@ -73,7 +73,7 @@ def gitlsfiles(dirname=''):

     

       24
       24
       +
                    cwd = topdir

     

       25
       25
       +
        

     

       26
       26
       +
                filenames = check_output(

     

       27
       27
       +
       -            ['git', 'ls-files', '-z'], cwd=cwd, stderr=PIPE)

     

       28
       28
       +
       +            ['@git@', 'ls-files', '-z'], cwd=cwd, stderr=PIPE)

     

       29
       29
       +
            except (CalledProcessError, OSError):

     

       30
       30
       +
                # Setuptools mandates we fail silently

     

       31
       31
       +
                return res