Merge pull request #110210 from SuperSandro2000/fix-collection4

Fix collection 4: substituteInPlace cleanups, pythonPackages.azure-synapse-artifacts: Fix meta
This commit is contained in:
Sandro 2021-01-20 23:26:19 +01:00 committed by GitHub
commit c4965b409a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 35 deletions

View File

@ -23,8 +23,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "azure.synapse.artifacts" ]; pythonImportsCheck = [ "azure.synapse.artifacts" ];
meta = with lib; { meta = with lib; {
description = "CHANGE"; description = "Microsoft Azure Synapse Artifacts Client Library for Python";
homepage = "https://github.com/CHANGE/azure-synapse-artifacts/"; homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ jonringer ]; maintainers = with maintainers; [ jonringer ];
}; };

View File

@ -1,26 +1,27 @@
{ lib, stdenv, buildPythonPackage, fetchPypi { lib, stdenv, buildPythonPackage, fetchFromGitHub
, click, click-log, pure-pcapy3 , click, click-log, pure-pcapy3
, pyserial, pyserial-asyncio, voluptuous, zigpy , pyserial-asyncio, voluptuous, zigpy
, asynctest, pytest, pytest-asyncio }: , asynctest, pytestCheckHook, pytest-asyncio }:
let buildPythonPackage rec {
pname = "bellows"; pname = "bellows";
version = "0.21.0"; version = "0.21.0";
in buildPythonPackage rec { src = fetchFromGitHub {
inherit pname version; owner = "zigpy";
repo = "bellows";
src = fetchPypi { rev = version;
inherit pname version; sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a";
sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy
]; ];
checkInputs = [ checkInputs = [
asynctest pytest pytest-asyncio asynctest
pytestCheckHook
pytest-asyncio
]; ];
prePatch = '' prePatch = ''

View File

@ -3,7 +3,7 @@
, sphinx , sphinx
, hypothesis , hypothesis
, py , py
, pytest , pytestCheckHook
, pytest-benchmark , pytest-benchmark
, sortedcollections , sortedcollections
, sortedcontainers , sortedcontainers
@ -23,23 +23,14 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm ]; nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ sphinx ]; propagatedBuildInputs = [ sphinx ];
# this can be removed >0.19.0
postPatch = ''
substituteInPlace setup.py \
--replace "setuptools_scm < 4" "setuptools_scm"
'';
checkInputs = [ checkInputs = [
hypothesis hypothesis
py py
pytest pytestCheckHook
pytest-benchmark pytest-benchmark
sortedcollections sortedcollections
sortedcontainers sortedcontainers
]; ];
checkPhase = ''
pytest tests
'';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/jab/bidict"; homepage = "https://github.com/jab/bidict";

View File

@ -19,11 +19,6 @@ buildPythonPackage rec {
sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp"; sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp";
}; };
postPatch = ''
substituteInPlace setup.py \
--replace "audio-metadata>=0.8,<0.9" "audio-metadata"
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
appdirs appdirs
audio-metadata audio-metadata

View File

@ -20,9 +20,7 @@ buildPythonPackage {
postPatch = '' postPatch = ''
substituteInPlace python/setup.py \ substituteInPlace python/setup.py \
--replace "graphviz<0.9.0," "graphviz" \ --replace "graphviz<0.9.0," "graphviz"
--replace "numpy<=1.15.2," "numpy" \
--replace "requests<2.19.0," "requests"
''; '';
preConfigure = '' preConfigure = ''

View File

@ -44,8 +44,7 @@ buildPythonPackage rec {
sed -i /pyqtwebengine/d setup.py sed -i /pyqtwebengine/d setup.py
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "pyqt5<5.13" "pyqt5" \ --replace "pyqt5<5.13" "pyqt5" \
--replace "parso==0.7.0" "parso" \ --replace "parso==0.7.0" "parso"
--replace "jedi==0.17.1" "jedi"
''; '';
postInstall = '' postInstall = ''

View File

@ -19038,6 +19038,7 @@ let
description = "lib/Safe/Hole.pm"; description = "lib/Safe/Hole.pm";
license = with lib.licenses; [ artistic1 gpl1Plus ]; license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/toddr/Safe-Hole"; homepage = "https://github.com/toddr/Safe-Hole";
broken = stdenv.isDarwin;
}; };
}; };