Unverified Commit d0860255 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #312281 from Sigmanificient/the-great-python3.8-purge 

The great python3.8 purge [0] (python < 3.5)
parents f078d182 2980f206

pkgs/applications/graphics/dosage/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ python3Packages.buildPythonApplication rec { 
    colorama imagesize lxml requests setuptools six

  ];



  disabled = python3Packages.pythonOlder "3.3";



  meta = {

    description = "A comic strip downloader and archiver";

    mainProgram = "dosage";

pkgs/applications/virtualization/docker/compose_1.nix

+3 −5
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, functools32, paramiko, distro, python-dotenv

, paramiko, distro, python-dotenv

}:



buildPythonApplication rec {
@@ -24,9 +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

  ++ lib.optional (pythonOlder "3.2") functools32;

  ];



  postPatch = ''

    # Remove upper bound on requires, see also

pkgs/development/embedded/rshell/default.nix

+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=";

pkgs/development/python-modules/absl-py/default.nix

+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

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

+0 −6
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi



, pythonOlder



, pytestCheckHook



, setuptools

}:
@@ -14,8 +10,6 @@ buildPythonPackage rec { 
  version = "0.0.95";

  pyproject = true;



  disabled = pythonOlder "3.3";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-0gEPXqw99UTsSOwRYQLgaFkaNFsaWA8ylz24pQX8p0Q=";