Merge pull request #173677 from dotlambda/parsedmarc-8.2.0

python3Packages.parsedmarc: 7.0.1 -> 8.2.0

pkgs/development/python-modules/msgraph-core/default.nix

@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, flit-core
+, requests
+, pytestCheckHook
+, responses
+}:
+
+buildPythonPackage rec {
+  pname = "msgraph-core";
+  version = "0.2.2";
+
+  disabled = pythonOlder "3.5";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "microsoftgraph";
+    repo = "msgraph-sdk-python-core";
+    rev = "v${version}";
+    hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA=";
+  };
+
+  nativeBuildInputs = [
+    flit-core
+  ];
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    responses
+  ];
+
+  disabledTestPaths = [
+    "tests/integration"
+  ];
+
+  pythonImportsCheck = [ "msgraph.core" ];
+
+  meta = {
+    description = "Core component of the Microsoft Graph Python SDK";
+    homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}

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

@@ -1,26 +1,35 @@
 { buildPythonPackage
 , fetchPypi
 , fetchurl
-, pythonOlder
 , lib
 , nixosTests
+, python
+, pythonOlder
 
 # pythonPackages
-, tqdm
 , dnspython
 , expiringdict
-, urllib3
-, requests
 , publicsuffix2
 , xmltodict
 , geoip2
+, urllib3
+, requests
 , imapclient
 , dateparser
+, mailsuite
+, elasticsearch
 , elasticsearch-dsl
 , kafka-python
-, mailsuite
+, tqdm
 , lxml
 , boto3
+, msgraph-core
+, azure-identity
+, google-api-core
+, google-api-python-client
+, google-auth
+, google-auth-httplib2
+, google-auth-oauthlib
 }:
 
 let
@@ -31,33 +40,49 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "7.0.1";
+  version = "8.2.0";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mi4hx410y7ikpfy1582lm252si0c3yryj0idqgqbx417fm21jjc";
+    sha256 = "eb82328dffb4a62ddaefbcc22efd5a2694350504a56d41ba1e161f2d998dcbff";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "elasticsearch<7.14.0" "elasticsearch"
+  '';
+
   propagatedBuildInputs = [
-    tqdm
     dnspython
     expiringdict
-    urllib3
-    requests
     publicsuffix2
     xmltodict
     geoip2
+    urllib3
+    requests
     imapclient
     dateparser
+    mailsuite
+    elasticsearch
     elasticsearch-dsl
     kafka-python
-    mailsuite
+    tqdm
     lxml
     boto3
+    msgraph-core
+    azure-identity
+    google-api-core
+    google-api-python-client
+    google-auth
+    google-auth-httplib2
+    google-auth-oauthlib
   ];
 
+  # no tests on PyPI, no tags on GitHub
+  doCheck = false;
+
   pythonImportsCheck = [ "parsedmarc" ];
 
   passthru = {

pkgs/top-level/python-packages.nix

@@ -6391,6 +6391,8 @@ in {
 
   micloud = callPackage ../development/python-modules/micloud { };
 
+  msgraph-core = callPackage ../development/python-modules/msgraph-core { };
+
   netmap = callPackage ../development/python-modules/netmap { };
 
   openai = callPackage ../development/python-modules/openai { };