Merge pull request #144877 from fabaff/bump-devtools

python3Packages.devtools: add missing dependencies

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

@@ -1,9 +1,19 @@
-{ buildPythonPackage, pythonOlder, fetchFromGitHub, lib, pygments
-, pytestCheckHook, pytest-mock }:
+{ lib
+, asttokens
+, buildPythonPackage
+, executing
+, fetchFromGitHub
+, pygments
+, pytest-mock
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "devtools";
   version = "0.8.0";
+  format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
@@ -13,11 +23,25 @@ buildPythonPackage rec {
     sha256 = "0yavcbxzxi1nfa1k326gsl03y8sadi5z5acamwd8b1bsiv15p757";
   };
 
-  propagatedBuildInputs = [ pygments ];
+  propagatedBuildInputs = [
+    asttokens
+    executing
+    pygments
+  ];
 
-  checkInputs = [ pytestCheckHook pytest-mock ];
+  checkInputs = [
+    pytestCheckHook
+    pytest-mock
+  ];
 
-  pythonImportsCheck = [ "devtools" ];
+  disabledTests = [
+    # Test for Windows32
+    "test_print_subprocess"
+  ];
+
+  pythonImportsCheck = [
+    "devtools"
+  ];
 
   meta = with lib; {
     description = "Python's missing debug print command and other development tools";

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

@@ -1,19 +1,20 @@
 { lib
+, asttokens
 , buildPythonPackage
 , fetchFromGitHub
 , setuptools-scm
-, asttokens
 }:
 
 buildPythonPackage rec {
   pname = "executing";
-  version = "0.5.4";
+  version = "0.8.2";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv";
+    sha256 = "sha256-CDZQ9DONn7M+2/GtmM2G6nQPpI9dOd0ca+2F1PGRwO4=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +27,13 @@ buildPythonPackage rec {
 
   # Tests appear to run fine (Ran 22 tests in 4.076s) with setuptoolsCheckPhase
   # but crash with pytestCheckHook
-  checkInputs = [ asttokens ];
+  checkInputs = [
+    asttokens
+  ];
+
+  pythonImportsCheck = [
+    "executing"
+  ];
 
   meta = with lib; {
     description = "Get information about what a frame is currently doing, particularly the AST node being executed";