Commit 05fa5917 authored by Sigmanificient's avatar Sigmanificient
Browse files

treewide: drop python 3.4 checks

parent 5d5c4baa
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
{ lib, buildPythonApplication, fetchPypi, pythonOlder
{ lib, buildPythonApplication, fetchPypi
, installShellFiles
, mock, pytest, nose
, pyyaml, colorama, docopt
, dockerpty, docker, jsonschema, requests
, six, texttable, websocket-client, cached-property
, enum34, paramiko, distro, python-dotenv
, paramiko, distro, python-dotenv
}:

buildPythonApplication rec {
@@ -24,8 +24,7 @@ buildPythonApplication rec {
    pyyaml colorama dockerpty docker
    jsonschema requests six texttable websocket-client
    docopt cached-property paramiko distro python-dotenv
  ]
  ++ lib.optional (pythonOlder "3.4") enum34;
  ];

  postPatch = ''
    # Remove upper bound on requires, see also
+0 −3
Original line number Diff line number Diff line
@@ -3,15 +3,12 @@
, fetchPypi
, pyserial
, pyudev
, pythonOlder
}:

buildPythonApplication rec {
  pname = "rshell";
  version = "0.0.32";

  disabled = pythonOlder "3.4";

  src = fetchPypi {
    inherit pname version;
    sha256 = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8=";
+0 −4
Original line number Diff line number Diff line
{ buildPythonPackage
, lib
, pythonOlder
, fetchPypi
, setuptools
, six
, enum34
}:

buildPythonPackage rec {
@@ -23,8 +21,6 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    six
  ] ++ lib.optionals (pythonOlder "3.4") [
    enum34
  ];

  # checks use bazel; should be revisited
+0 −3
Original line number Diff line number Diff line
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, attrs
, pluggy
, six
@@ -15,8 +14,6 @@ buildPythonPackage rec {
  version = "2.13.5";
  format = "setuptools";

  disabled = pythonOlder "3.4";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-pWkLVfBrLEhdhuTE95K3aqrhEY2wEyo5uRzuJC3ngjE=";
+1 −3
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@
, buildPythonPackage
, fetchFromGitHub
, pycrypto
, pythonOlder
, enum34
, python
}:

@@ -21,7 +19,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    pycrypto
  ] ++ lib.optional (pythonOlder "3.4") enum34;
  ];

  checkPhase = ''
    ${python.interpreter} -m android_backup.tests
Loading