From 5c919060187996255e56212f2c8e737fead9eadb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Nov 2022 20:32:35 +0000
Subject: [PATCH 1/3] python310Packages.flake8-import-order: 0.18.1 -> 0.18.2

---
 .../python-modules/flake8-import-order/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index 25aa995f9122..be89c1fcab21 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "flake8-import-order";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2";
+    sha256 = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4=";
   };
 
   propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34;

From 0167b31088dd2d763cdb9986d3b70b8387daddb2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 27 Nov 2022 08:26:07 +0100
Subject: [PATCH 2/3] python310Packages.flake8-import-order: add changelog to
 meta

---
 .../python-modules/flake8-import-order/default.nix  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index be89c1fcab21..cf682c7e8768 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -1,4 +1,13 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, enum34
+, pycodestyle
+, pytest
+, flake8
+, pylama
+}:
 
 buildPythonPackage rec {
   pname = "flake8-import-order";
@@ -20,6 +29,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Flake8 and pylama plugin that checks the ordering of import statements";
     homepage = "https://github.com/PyCQA/flake8-import-order";
+    changelog = "https://github.com/PyCQA/flake8-import-order/blob/${version}/CHANGELOG.rst";
     license = with licenses; [ lgpl3 mit ];
+    maintainers = with maintainers; [ ];
   };
 }

From 81b938da81e0480cbf37cce6cab5085603c79bf3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 27 Nov 2022 08:33:21 +0100
Subject: [PATCH 3/3] python310Packages.flake8-import-order: switch to
 pytestCheckHook

- add pythonImportsCheck
- disable on unsupported Python releases
---
 .../flake8-import-order/default.nix           | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index cf682c7e8768..53c388690140 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -1,30 +1,39 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPy3k
-, enum34
-, pycodestyle
-, pytest
 , flake8
+, pycodestyle
 , pylama
+, pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "flake8-import-order";
   version = "0.18.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4=";
+    hash = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4=";
   };
 
-  propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34;
+  propagatedBuildInputs = [
+    pycodestyle
+  ];
 
-  checkInputs = [ pytest flake8 pycodestyle pylama ];
+  checkInputs = [
+    flake8
+    pycodestyle
+    pylama
+    pytestCheckHook
+  ];
 
-  checkPhase = ''
-    pytest --strict
-  '';
+  pythonImportsCheck = [
+    "flake8_import_order"
+  ];
 
   meta = with lib; {
     description = "Flake8 and pylama plugin that checks the ordering of import statements";