Unverified Commit d3b4a08e authored by Theodore Ni's avatar Theodore Ni Committed by GitHub
Browse files

Merge pull request #251533 from tjni/pypa-fix-issues 

Fix more staging-next Python failures
parents 3503eea8 8d5f4d61

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

+10 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, pythonOlder

, fetchPypi

, jupyter-packaging

, jupyterlab

, bqscales

, ipywidgets

, numpy
@@ -23,8 +24,17 @@ buildPythonPackage rec { 
    hash = "sha256-FNjeb5pNGUW76mwTIOpNHJMlb3JoN3T24AINzFefPdI=";

  };



  # upstream seems in flux for 0.13 release. they seem to want to migrate from

  # jupyter_packaging to hatch, so let's patch instead of fixing upstream

  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace "jupyter_packaging~=" "jupyter_packaging>=" \

      --replace "jupyterlab~=" "jupyterlab>="

  '';



  nativeBuildInputs = [

    jupyter-packaging

    jupyterlab

  ];



  propagatedBuildInputs = [

pkgs/development/python-modules/django-scim2/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ buildPythonPackage rec { 
    hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig=";

  };



  # remove this when upstream releases a new version > 0.19.0

  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace "poetry>=0.12" "poetry-core>=1.5.2" \

      --replace "poetry.masonry.api" "poetry.core.masonry.api"

  '';

pkgs/development/python-modules/jupyter-collaboration/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
, jupyter-server

, jupyter-server-fileid

, jupyter-ydoc

, jupyterlab

, ypy-websocket

, pytest-asyncio

, pytest-jupyter
@@ -38,6 +39,7 @@ buildPythonPackage rec { 
    hatch-jupyter-builder

    hatch-nodejs-version

    hatchling

    jupyterlab

    pythonRelaxDepsHook

  ];

pkgs/development/python-modules/python-telegram-bot/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -14,13 +14,15 @@ 
, pytestCheckHook

, pythonOlder

, pytz

, setuptools

, wheel

, tornado

}:



buildPythonPackage rec {

  pname = "python-telegram-bot";

  version = "20.4";

  format = "setuptools";

  format = "pyproject";



  disabled = pythonOlder "3.8";
@@ -31,6 +33,11 @@ buildPythonPackage rec { 
    hash = "sha256-owbJJZjBkMjsgfBLRl+rnePrIvQ0sUZs7rP9ie912pw=";

  };



  nativeBuildInputs = [

    setuptools

    wheel

  ];



  propagatedBuildInputs = [

    aiolimiter

    apscheduler

pkgs/development/python-modules/qcodes-loop/default.nix

+16 −2
Original line number Diff line number Diff line 
{ lib

, fetchpatch

, fetchPypi

, pythonOlder

, buildPythonPackage
@@ -8,7 +9,9 @@ 
, matplotlib

, numpy

, pandas

, setuptools

, versioningit

, wheel

, xarray

, hickle

, ipython
@@ -24,18 +27,29 @@ 
buildPythonPackage rec {

  pname = "qcodes-loop";

  version = "0.1.1";

  format = "pyproject";



  disabled = pythonOlder "3.8";

  format = "pyproject";



  src = fetchPypi {

    inherit version;

    pname = "qcodes_loop";

    sha256 = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM=";

    hash = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM=";

  };



  patches = [

    # https://github.com/QCoDeS/Qcodes_loop/pull/39

    (fetchpatch {

      name = "relax-versioningit-dependency.patch";

      url = "https://github.com/QCoDeS/Qcodes_loop/commit/58006d3fb57344ae24dd44bceca98004617b5b57.patch";

      hash = "sha256-mSlm/Ql8e5xPL73ifxSoVc9+U58AAcAmBkdW5P6zEsg=";

    })

  ];



  nativeBuildInputs = [

    setuptools

    versioningit

    wheel

  ];



  propagatedBuildInputs = [