Merge pull request #251533 from tjni/pypa-fix-issues
Fix more staging-next Python failures
This commit is contained in:
commit
d3b4a08e6e
|
@ -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 = [
|
||||
|
|
|
@ -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"
|
||||
'';
|
||||
|
||||
|
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ 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 = [
|
||||
|
|
|
@ -2,9 +2,10 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# build-sytem
|
||||
# build-system
|
||||
, cython_3
|
||||
, numpy
|
||||
, oldest-supported-numpy
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, gnutar
|
||||
|
@ -29,12 +30,13 @@ buildPythonPackage rec {
|
|||
hash = "sha256-q/K7XlqvDHAna+fqN6iiJ9wD8efsuwHiEfKjXS46jz8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython_3
|
||||
gnutar
|
||||
numpy
|
||||
oldest-supported-numpy
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
|
|
@ -21,7 +21,19 @@ python3.pkgs.buildPythonApplication rec {
|
|||
./skip-network-tests.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ];
|
||||
# Consider fixing this upstream by following up on:
|
||||
# https://github.com/gilesknap/gphotos-sync/issues/441
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "setuptools<57" "setuptools" \
|
||||
--replace "wheel==0.33.1" "wheel"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"psutil"
|
||||
|
|
|
@ -15,6 +15,12 @@ python3.pkgs.buildPythonApplication rec {
|
|||
hash = "sha256-ChVVXUjm6y71iRs64Kv63oiOG1GSqmx6J0YiGtEI0ao=";
|
||||
};
|
||||
|
||||
# Posted a PR for discussion upstream that can be followed:
|
||||
# https://github.com/p0dalirius/ApacheTomcatScanner/pull/32
|
||||
postPatch = ''
|
||||
sed -i '/apachetomcatscanner=apachetomcatscanner\.__main__:main/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
requests
|
||||
sectools
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
, buildPythonApplication
|
||||
, pytestCheckHook
|
||||
, bubblewrap
|
||||
|
@ -41,9 +43,10 @@ buildPythonApplication rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
|
||||
propagatedBuildInputs = [
|
||||
systemdForMkosi
|
||||
bubblewrap
|
||||
|
|
Loading…
Reference in a new issue