Unverified Commit 777bff68 authored by Michael Daniels's avatar Michael Daniels
Browse files

python3Packages.{astropy-extension-helpers,extension-helpers}: combine at 1.4.0 

astropy-extension-helpers was at 1.1.0.

extension-helpers was at 1.4.0.

They are both the same package; they were just packaged twice.
parent 843ede39

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

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchPypi,

  fetchpatch,

  findutils,

  pytestCheckHook,

  pythonOlder,

  pip,

  setuptools,

  setuptools-scm,

  tomli,

  wheel,

}:



buildPythonPackage rec {

  pname = "extension-helpers";

  version = "1.1.0";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-SUYMeKP40fjOwXRHn16FrURZSMzEFgM8WqPm3fLFAik=";

  };



  patches = [

    # Not needed to allow this package to build, but meant for it's dependent

    # packages, like astropy. See explanation at:

    # https://github.com/astropy/extension-helpers/pull/59

    (fetchpatch {

      url = "https://github.com/astropy/extension-helpers/commit/796f3e7831298df2d26b6d994b13fd57061a56d1.patch";

      hash = "sha256-NnqK9HQq1hQ66RUJf9gTCuLyA0BVqVtL292mSXJ9860=";

    })

  ];



  nativeBuildInputs = [

    setuptools

    setuptools-scm

    wheel

  ];



  propagatedBuildInputs = [ tomli ];



  nativeCheckInputs = [

    findutils

    pip

    pytestCheckHook

  ];



  # avoid import mismatch errors, as conftest.py is copied to build dir

  enabledTestPaths = [ "extension_helpers" ];



  disabledTests = [

    # https://github.com/astropy/extension-helpers/issues/43

    "test_write_if_different"

  ];



  pythonImportsCheck = [ "extension_helpers" ];



  meta = with lib; {

    description = "Utilities for building and installing packages in the Astropy ecosystem";

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

    license = licenses.bsd3;

    maintainers = with maintainers; [ rmcgibbo ];

  };

}

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

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  fetchPypi,

  numpy,

  astropy,

  astropy-extension-helpers,

  extension-helpers,

  setuptools,

  setuptools-scm,

  pytestCheckHook,
@@ -25,7 +25,7 @@ buildPythonPackage rec { 
  };



  nativeBuildInputs = [

    astropy-extension-helpers

    extension-helpers

    numpy

    setuptools

    setuptools-scm

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

+6 −6
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
  fetchFromGitHub,

  build,

  cython,

  findutils,

  pip,

  pytestCheckHook,

  pythonOlder,

  setuptools-scm,
@@ -17,8 +19,6 @@ buildPythonPackage rec { 
  version = "1.4.0";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "astropy";

    repo = "extension-helpers";
@@ -36,6 +36,8 @@ buildPythonPackage rec { 
  nativeCheckInputs = [

    build

    cython

    findutils

    pip

    pytestCheckHook

    wheel

  ];
@@ -45,10 +47,8 @@ buildPythonPackage rec { 
  enabledTestPaths = [ "extension_helpers/tests" ];



  disabledTests = [

    # Test require network access

    "test_only_pyproject"

    # ModuleNotFoundError

    "test_no_setup_py"

    # https://github.com/astropy/extension-helpers/issues/43

    "test_write_if_different"

  ];



  meta = with lib; {

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ mapAliases { 
  argon2_cffi = argon2-cffi; # added 2022-05-09

  arnparse = throw "arnparse has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04

  APScheduler = apscheduler; # added 2023-02-19

  astropy-extension-helpers = extension-helpers; # Added 2025-10-15

  async_generator = async-generator; # added 2023-08-08

  async_stagger = async-stagger; # added 2023-08-08

  asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07

pkgs/top-level/python-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -1001,8 +1001,6 @@ self: super: with self; { 














  astropy = callPackage ../development/python-modules/astropy { };



























  astropy-extension-helpers = callPackage ../development/python-modules/astropy-extension-helpers { };



























  astropy-healpix = callPackage ../development/python-modules/astropy-healpix { };





























  astropy-helpers = callPackage ../development/python-modules/astropy-helpers { };