build: updated rhodecode-tools requirement

- cleanup of patches/deps

pkgs/patches/pytest/setuptools.patch

@@ -1,7 +1,7 @@
-diff -rup pytest-4.6.5-orig/setup.py pytest-4.6.5/setup.py
---- pytest-4.6.5-orig/setup.py	2018-04-10 10:23:04.000000000 +0200
-+++  pytest-4.6.5/setup.py	2018-04-10 10:23:34.000000000 +0200
-@@ -24,7 +24,7 @@ INSTALL_REQUIRES = [
+diff -rup pytest-4.6.9-orig/setup.py pytest-4.6.9/setup.py
+--- pytest-4.6.9-orig/setup.py	2018-04-10 10:23:04.000000000 +0200
++++  pytest-4.6.9/setup.py	2018-04-10 10:23:34.000000000 +0200
+@@ -24,7 +24,7 @@ def main():
  def main():
      setup(
          use_scm_version={"write_to": "src/_pytest/_version.py"},

pkgs/patches/rhodecode_tools/requirements.patch

@@ -0,0 +1,12 @@
+diff -rup rhodecode-tools-2.0.0-orig/requirements.txt rhodecode-tools-2.0.0/requirements.txt
+--- rhodecode-tools-2.0.0/requirements-orig.txt	2021-03-11 12:34:45.000000000 +0100
++++ rhodecode-tools-2.0.0/requirements.txt	2021-03-11 12:34:56.000000000 +0100
+@@ -40,8 +40,6 @@ ipython==5.1.0
+ ipdb==0.13.2
+ ipython==5.1.0
+
+-## test related requirements
+--r requirements_test.txt
+
+ ## uncomment to add the debug libraries
+ #-r requirements_debug.txt

pkgs/patches/rhodecode_tools/setuptools.patch

@@ -1,13 +1,13 @@
-diff -rup rhodecode-tools-1.4.1-orig/setup.py rhodecode-tools-1.4.1/setup.py
---- rhodecode-tools-1.4.1/setup-orig.py	2021-03-11 12:34:45.000000000 +0100
-+++ rhodecode-tools-1.4.1/setup.py	2021-03-11 12:34:56.000000000 +0100
-@@ -69,7 +69,7 @@ def _get_requirements(req_filename, excl
-
-
- # requirements extract
--setup_requirements = ['pytest-runner']
-+setup_requirements = ['pytest-runner==5.1.0']
+diff -rup rhodecode-tools-2.0.0-orig/setup.py rhodecode-tools-2.0.0/setup.py
+--- rhodecode-tools-2.0.0/setup-orig.py	2021-03-11 12:34:45.000000000 +0100
++++ rhodecode-tools-2.0.0/setup.py	2021-03-11 12:34:56.000000000 +0100
+@@ -98,8 +98,7 @@ install_requirements = _get_requirements(
+ setup_requirements = []
  install_requirements = _get_requirements(
      'requirements.txt', exclude=['setuptools'])
- -test_requirements = _get_requirements('requirements_test.txt')
- -test_requirements = []
+-test_requirements = _get_requirements(
+-    'requirements_test.txt')
++test_requirements = []
+
+
+ def get_version():

pkgs/python-packages-overrides.nix

@@ -57,12 +57,6 @@ self: super: {
     ];
   });
 
-  "future" = super."future".override (attrs: {
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  });
-
   "testpath" = super."testpath".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -343,6 +337,7 @@ self: super: {
   "rhodecode-tools" = super."rhodecode-tools".override (attrs: {
     patches = [
       ./patches/rhodecode_tools/setuptools.patch
+      ./patches/rhodecode_tools/requirements.patch
     ];
   });
 

pkgs/python-packages.nix

@@ -1585,7 +1585,7 @@ self: super: {
     };
   };
   "pytest" = super.buildPythonPackage {
-    name = "pytest-4.6.5";
+    name = "pytest-4.6.9";
     doCheck = false;
     propagatedBuildInputs = [
       self."py"
@@ -1601,23 +1601,23 @@ self: super: {
       self."more-itertools"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/2a/c6/1d1f32f6a5009900521b12e6560fb6b7245b0d4bc3fb771acd63d10e30e1/pytest-4.6.5.tar.gz";
-      sha256 = "0iykwwfp4h181nd7rsihh2120b0rkawlw7rvbl19sgfspncr3hwg";
+      url = "https://files.pythonhosted.org/packages/ec/2e/1602fca477ab3ccb1952f07db0536b60b6afafec16eced8063b553001509/pytest-4.6.9.tar.gz";
+      sha256 = "0fgkmpc31nzy97fxfrkqbzycigdwxwwmninx3qhkzp81migggs0r";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pytest-cov" = super.buildPythonPackage {
-    name = "pytest-cov-2.7.1";
+    name = "pytest-cov-2.8.1";
     doCheck = false;
     propagatedBuildInputs = [
       self."pytest"
       self."coverage"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/bb/0f/3db7ff86801883b21d5353b258c994b1b8e2abbc804e2273b8d0fd19004b/pytest-cov-2.7.1.tar.gz";
-      sha256 = "0filvmmyqm715azsl09ql8hy2x7h286n6d8z5x42a1wpvvys83p0";
+      url = "https://files.pythonhosted.org/packages/13/8a/51f54b43a043c799bceca846594b9a310823a3e52df5ec27109cccba90f4/pytest-cov-2.8.1.tar.gz";
+      sha256 = "0avzlk9p4nc44k7lpx9109dybq71xqnggxb9f4hp0l64pbc44ryc";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.mit ];
@@ -1640,18 +1640,18 @@ self: super: {
     };
   };
   "pytest-runner" = super.buildPythonPackage {
-    name = "pytest-runner-5.1";
+    name = "pytest-runner-5.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/d9/6d/4b41a74b31720e25abd4799be72d54811da4b4d0233e38b75864dcc1f7ad/pytest-runner-5.1.tar.gz";
-      sha256 = "0ykfcnpp8c22winj63qzc07l5axwlc9ikl8vn05sc32gv3417815";
+      url = "https://files.pythonhosted.org/packages/5b/82/1462f86e6c3600f2471d5f552fcc31e39f17717023df4bab712b4a9db1b3/pytest-runner-5.2.tar.gz";
+      sha256 = "0awll1bva5zy8cspsxcpv7pjcrdf5c6pf56nqn4f74vvmlzfgiwn";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pytest-sugar" = super.buildPythonPackage {
-    name = "pytest-sugar-0.9.2";
+    name = "pytest-sugar-0.9.3";
     doCheck = false;
     propagatedBuildInputs = [
       self."pytest"
@@ -1659,8 +1659,8 @@ self: super: {
       self."packaging"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/55/59/f02f78d1c80f7e03e23177f60624c8106d4f23d124c921df103f65692464/pytest-sugar-0.9.2.tar.gz";
-      sha256 = "1asq7yc4g8bx2sn7yy974mhc9ywvaihasjab4inkirdwn9s7mn7w";
+      url = "https://files.pythonhosted.org/packages/ba/35/edf24df4b2fe7d9005bdb9d166c18ae9cefd8b664e7fb2c8dfb7bc9db184/pytest-sugar-0.9.3.tar.gz";
+      sha256 = "1i0hv3h49zvl62jbiyjag84carbrp3zprqzxffdr291nxavvac0n";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];

requirements.txt

@@ -17,7 +17,6 @@ deform==2.0.8
 docutils==0.16.0
 dogpile.cache==0.9.0
 formencode==1.2.4
-future==0.14.3
 futures==3.0.2
 infrae.cache==1.0.1
 iso8601==0.1.12

requirements_test.txt

@@ -1,9 +1,9 @@
 # test related requirements
-pytest==4.6.5
-py==1.8.0
-pytest-cov==2.7.1
-pytest-sugar==0.9.2
-pytest-runner==5.1.0
+pytest==4.6.9
+py==1.8.1
+pytest-cov==2.8.1
+pytest-sugar==0.9.3
+pytest-runner==5.2.0
 pytest-profiling==1.7.0
 pytest-timeout==1.3.3
 gprof2dot==2017.9.19