From 52487f4e431d836eb3ecb87af24915967062d862 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 23 Jan 2020 22:09:41 -0500 Subject: [PATCH] pythonPackages.fluidasserts: 20.1.28253 -> 20.1.33141 --- .../python-modules/fluidasserts/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix index f76692c50d97..78405ed8a660 100644 --- a/pkgs/development/python-modules/fluidasserts/default.nix +++ b/pkgs/development/python-modules/fluidasserts/default.nix @@ -12,9 +12,12 @@ , azure-mgmt-compute , azure-mgmt-keyvault , azure-mgmt-network +, azure-mgmt-resource +, azure-mgmt-security , azure-mgmt-storage , azure-mgmt-web , azure-storage-file +, azure-storage-file-share , bandit , bcrypt , beautifulsoup4 @@ -39,6 +42,7 @@ , psycopg2 , pycrypto , pygments +, pyhcl , pyjks , pynacl , pyopenssl @@ -57,30 +61,30 @@ buildPythonPackage rec { pname = "fluidasserts"; - version = "20.1.28253"; + version = "20.1.33141"; disabled = !isPy37; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1d2smx9ywd1azsiwgavp69vlixmvwaabshprm192wnmprbghsp6c"; + sha256 = "01l6yb3r19q8b4kwqkrzn7mpfsr65zsgzax2fbs43hb6pq6vavnx"; }; patchPhase = '' # Version mismatches between current FluidAsserts and Nixpkgs substituteInPlace ./setup.py \ - --replace 'tlslite-ng==0.8.0-alpha29' 'tlslite-ng==0.7.5' \ - --replace 'boto3==1.10.17' 'boto3==1.10.1' \ + --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \ + --replace 'boto3==1.11.7' 'boto3==1.10.1' \ --replace 'cfn-flip==1.2.2' 'cfn-flip==1.1.0.post1' \ - --replace 'azure-mgmt-storage==7.1.0' 'azure-mgmt-storage==7.0.0' \ + --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \ + --replace 'pillow==7.0.0' 'pillow==6.2.1' \ # Functionality that will be not present for the momment # but that we'll work to add in the future # Just a minimal portion of fluidasserts use this substituteInPlace ./setup.py \ - --replace "'azure-storage-file-share==12.0.0'," "" \ --replace "'pymssql==2.1.4'," "" \ - --replace "'pytesseract==0.3.0'," "" \ + --replace "'pytesseract==0.3.1'," "" \ --replace "'pywinrm==0.4.1'," "" \ --replace "'mitmproxy==5.0.1'," "" \ @@ -96,9 +100,12 @@ buildPythonPackage rec { azure-mgmt-compute azure-mgmt-keyvault azure-mgmt-network + azure-mgmt-resource + azure-mgmt-security azure-mgmt-storage azure-mgmt-web azure-storage-file + azure-storage-file-share bandit bcrypt beautifulsoup4 @@ -123,6 +130,7 @@ buildPythonPackage rec { psycopg2 pycrypto pygments + pyhcl pyjks pynacl pyopenssl @@ -146,9 +154,10 @@ buildPythonPackage rec { rm test/conftest.py pytest \ + test/test_cloud_aws_terraform_{ebs,ec2}.py \ test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \ test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \ - test/test_format_{apk,file,jks,jwt,pdf,pkcs12,string}.py \ + test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \ test/test_helper_{asynchronous,crypto}.py \ test/test_lang_{javascript,java}.py \ test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \