commit a68f2550a153f10408dca976844cf213ee7432cc · pyrox.dev/nixpkgs

+19 -14

pkgs/development/python-modules/astropy-helpers/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         isPy3k,

     

       6
       6
       -
         pythonAtLeast,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         setuptools,

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       buildPythonPackage rec {

     

       10
       9
        
         pname = "astropy-helpers";

     

       11
       10
        
         version = "4.0.1";

     

       12
       12
       -
         format = "setuptools";

     

       11
       11
       +
         pyproject = true;

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "astropy";

     

       15
       15
       +
           repo = "astropy-helpers";

     

       16
       16
       +
           tag = "v${version}";

     

       17
       17
       +
           hash = "sha256-MjL/I+ApyoyoD2NmKuKWpDbyuEgvBb2OBhxqj/w/3lk=";

     

       18
       18
       +
         };

     

       13
       19
        
       

     

       14
       14
       -
         # ModuleNotFoundError: No module named 'imp'

     

       15
       15
       -
         disabled = !isPy3k || pythonAtLeast "3.12";

     

       20
       20
       +
         patches = [

     

       21
       21
       +
           # Fixes build with Python 3.12+

     

       22
       22
       +
           ./python-imp.patch

     

       23
       23
       +
         ];

     

       16
       24
        
       

     

       17
       17
       -
         doCheck = false; # tests requires sphinx-astropy

     

       25
       25
       +
         build-system = [ setuptools ];

     

       18
       26
        
       

     

       19
       19
       -
         src = fetchPypi {

     

       20
       20
       -
           inherit pname version;

     

       21
       21
       -
           sha256 = "f1096414d108778218d6bea06d4d9c7b2ff7c83856a451331ac194e74de9f413";

     

       22
       22
       -
         };

     

       27
       27
       +
         pythonImportsCheck = [ "astropy_helpers" ];

     

       23
       28
        
       

     

       24
       24
       -
         meta = with lib; {

     

       29
       29
       +
         meta = {

     

       25
       30
        
           description = "Utilities for building and installing Astropy, Astropy affiliated packages, and their respective documentation";

     

       26
       31
        
           homepage = "https://github.com/astropy/astropy-helpers";

     

       27
       27
       -
           license = licenses.bsd3;

     

       28
       28
       -
           maintainers = [ maintainers.smaret ];

     

       32
       32
       +
           license = lib.licenses.bsd3;

     

       33
       33
       +
           maintainers = [ lib.maintainers.smaret ];

     

       29
       34
        
         };

     

       30
       35
        
       }

+63

pkgs/development/python-modules/astropy-helpers/python-imp.patch

···

       1
       1
       +
       diff --git a/astropy_helpers/tests/test_git_helpers.py b/astropy_helpers/tests/test_git_helpers.py

     

       2
       2
       +
       index 6b826fc..3fb3a29 100644

     

       3
       3
       +
       --- a/astropy_helpers/tests/test_git_helpers.py

     

       4
       4
       +
       +++ b/astropy_helpers/tests/test_git_helpers.py

     

       5
       5
       +
       @@ -1,5 +1,5 @@

     

       6
       6
       +
        import glob

     

       7
       7
       +
       -import imp

     

       8
       8
       +
       +import importlib as imp

     

       9
       9
       +
        import os

     

       10
       10
       +
        import pkgutil

     

       11
       11
       +
        import re

     

       12
       12
       +
       diff --git a/astropy_helpers/utils.py b/astropy_helpers/utils.py

     

       13
       13
       +
       index 115c915..0cfc9e3 100644

     

       14
       14
       +
       --- a/astropy_helpers/utils.py

     

       15
       15
       +
       +++ b/astropy_helpers/utils.py

     

       16
       16
       +
       @@ -1,12 +1,12 @@

     

       17
       17
       +
        # Licensed under a 3-clause BSD style license - see LICENSE.rst

     

       18
       18
       +
        

     

       19
       19
       +
        import contextlib

     

       20
       20
       +
       -import imp

     

       21
       21
       +
        import os

     

       22
       22
       +
        import sys

     

       23
       23
       +
        import glob

     

       24
       24
       +
        

     

       25
       25
       +
        from importlib import machinery as import_machinery

     

       26
       26
       +
       +from importlib import util as importlib_util

     

       27
       27
       +
        

     

       28
       28
       +
        

     

       29
       29
       +
        # Note: The following Warning subclasses are simply copies of the Warnings in

     

       30
       30
       +
       @@ -54,9 +54,9 @@ def get_numpy_include_path():

     

       31
       31
       +
            import builtins

     

       32
       32
       +
            if hasattr(builtins, '__NUMPY_SETUP__'):

     

       33
       33
       +
                del builtins.__NUMPY_SETUP__

     

       34
       34
       +
       -    import imp

     

       35
       35
       +
       +    import importlib

     

       36
       36
       +
            import numpy

     

       37
       37
       +
       -    imp.reload(numpy)

     

       38
       38
       +
       +    importlib.reload(numpy)

     

       39
       39
       +
        

     

       40
       40
       +
            try:

     

       41
       41
       +
                numpy_include = numpy.get_include()

     

       42
       42
       +
       @@ -208,8 +208,6 @@ def import_file(filename, name=None):

     

       43
       43
       +
            # generates an underscore-separated name which is more likely to

     

       44
       44
       +
            # be unique, and it doesn't really matter because the name isn't

     

       45
       45
       +
            # used directly here anyway.

     

       46
       46
       +
       -    mode = 'r'

     

       47
       47
       +
       -

     

       48
       48
       +
            if name is None:

     

       49
       49
       +
                basename = os.path.splitext(filename)[0]

     

       50
       50
       +
                name = '_'.join(os.path.relpath(basename).split(os.sep)[1:])

     

       51
       51
       +
       @@ -221,8 +219,10 @@ def import_file(filename, name=None):

     

       52
       52
       +
                loader = import_machinery.SourceFileLoader(name, filename)

     

       53
       53
       +
                mod = loader.load_module()

     

       54
       54
       +
            else:

     

       55
       55
       +
       -        with open(filename, mode) as fd:

     

       56
       56
       +
       -            mod = imp.load_module(name, fd, filename, ('.py', mode, 1))

     

       57
       57
       +
       +        importlib_util

     

       58
       58
       +
       +        spec = importlib_util.spec_from_file_location(name, filename)

     

       59
       59
       +
       +        mod = importlib_util.module_from_spec(spec)

     

       60
       60
       +
       +        spec.loader.exec_module(mod)

     

       61
       61
       +
        

     

       62
       62
       +
            return mod

     

       63
       63
       +

+28 -17

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

···

       1
       1
        
       {

     

       2
       2
       -
         pkgs,

     

       2
       2
       +
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch2,

     

       5
       6
        
         astropy,

     

       7
       7
       +
         boto3,

     

       6
       8
        
         requests,

     

       7
       9
        
         keyring,

     

       8
       10
        
         beautifulsoup4,

     
···

       17
       19
        
         pyvo,

     

       18
       20
        
         astropy-helpers,

     

       19
       21
        
         setuptools,

     

       20
       20
       -
         isPy3k,

     

       21
       22
        
       }:

     

       22
       23
        
       

     

       23
       24
        
       buildPythonPackage rec {

     

       24
       25
        
         pname = "astroquery";

     

       25
       26
        
         version = "0.4.10";

     

       26
       26
       -
         format = "pyproject";

     

       27
       27
       +
         pyproject = true;

     

       27
       28
        
       

     

       28
       28
       -
         src = fetchPypi {

     

       29
       29
       -
           inherit pname version;

     

       30
       30
       -
           hash = "sha256-6s2R6do3jmQXQPvDEjhQ2qg7oJJqb/9MQMy/XcbVpAY=";

     

       29
       29
       +
         src = fetchFromGitHub {

     

       30
       30
       +
           owner = "astropy";

     

       31
       31
       +
           repo = "astroquery";

     

       32
       32
       +
           tag = "v${version}";

     

       33
       33
       +
           hash = "sha256-5pNKV+XNfUQca7WoWboVphXffzyVIHCmfxwr4nBMaEk=";

     

       31
       34
        
         };

     

       32
       35
        
       

     

       33
       33
       -
         disabled = !isPy3k;

     

       36
       36
       +
         patches = [

     

       37
       37
       +
           # https://github.com/astropy/astroquery/pull/3311

     

       38
       38
       +
           (fetchpatch2 {

     

       39
       39
       +
             name = "setuptools-package-index.patch";

     

       40
       40
       +
             url = "https://github.com/astropy/astroquery/commit/9d43beb4b7bea424d73fff0b602ca90026155519.patch";

     

       41
       41
       +
             hash = "sha256-3QdOwP1rlWeScGxHT9ZVPmffE7S1XE0cbtnQ8T4bIYw=";

     

       42
       42
       +
           })

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         build-system = [

     

       46
       46
       +
           astropy-helpers

     

       47
       47
       +
           setuptools

     

       48
       48
       +
         ];

     

       34
       49
        
       

     

       35
       35
       -
         propagatedBuildInputs = [

     

       50
       50
       +
         dependencies = [

     

       36
       51
        
           astropy

     

       37
       52
        
           requests

     

       38
       53
        
           keyring

     
···

       41
       56
        
           pyvo

     

       42
       57
        
         ];

     

       43
       58
        
       

     

       44
       44
       -
         nativeBuildInputs = [

     

       45
       45
       -
           astropy-helpers

     

       46
       46
       -
           setuptools

     

       47
       47
       -
         ];

     

       48
       48
       -
       

     

       49
       59
        
         # Disable automatic update of the astropy-helper module

     

       50
       60
        
         postPatch = ''

     

       51
       61
        
           substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"

     
···

       54
       64
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       55
       65
        
       

     

       56
       66
        
         checkInputs = [

     

       67
       67
       +
           boto3

     

       57
       68
        
           matplotlib

     

       58
       69
        
           pillow

     

       59
       70
        
           pytest

     
···

       76
       87
        
       

     

       77
       88
        
         pythonImportsCheck = [ "astroquery" ];

     

       78
       89
        
       

     

       79
       79
       -
         meta = with pkgs.lib; {

     

       90
       90
       +
         meta = {

     

       80
       91
        
           description = "Functions and classes to access online data resources";

     

       81
       92
        
           homepage = "https://astroquery.readthedocs.io/";

     

       82
       82
       -
           license = licenses.bsd3;

     

       83
       83
       -
           maintainers = [ maintainers.smaret ];

     

       93
       93
       +
           license = lib.licenses.bsd3;

     

       94
       94
       +
           maintainers = [ lib.maintainers.smaret ];

     

       84
       95
        
         };

     

       85
       96
        
       }