From 91bec616359354dbc108c41cea543145fe18abad Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 12 Aug 2020 21:53:09 -0700 Subject: [PATCH 1/2] python35: remove --- .../interpreters/python/default.nix | 13 ---- .../python-modules/ipython/7.9.nix | 69 ------------------- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 2 - pkgs/top-level/static.nix | 1 - 5 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/development/python-modules/ipython/7.9.nix diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c9c313b437ae..76963587c20d 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -63,19 +63,6 @@ in { inherit passthruFun; }; - python35 = callPackage ./cpython { - self = python35; - sourceVersion = { - major = "3"; - minor = "5"; - patch = "9"; - suffix = ""; - }; - sha256 = "0jdh9pvx6m6lfz2liwvvhn7vks7qrysqgwn517fkpxb77b33fjn2"; - inherit (darwin) configd; - inherit passthruFun; - }; - python36 = callPackage ./cpython { self = python36; sourceVersion = { diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix deleted file mode 100644 index 9953868df5f3..000000000000 --- a/pkgs/development/python-modules/ipython/7.9.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, pythonOlder -# Build dependencies -, glibcLocales -# Test dependencies -, nose -, pygments -# Runtime dependencies -, jedi -, decorator -, pickleshare -, traitlets -, prompt_toolkit -, pexpect -, appnope -, backcall -, fetchpatch -}: - -buildPythonPackage rec { - pname = "ipython"; - version = "7.9.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "103jkw18z7fnwdal1mdbijjxi1fndzn31g887lmj7ddpf2r07lyz"; - }; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = [ glibcLocales ]; - - checkInputs = [ nose pygments ]; - - propagatedBuildInputs = [ - jedi - decorator - pickleshare - traitlets - prompt_toolkit - pygments - pexpect - backcall - ] ++ lib.optionals stdenv.isDarwin [appnope]; - - LC_ALL="en_US.UTF-8"; - - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - - pythonImportsCheck = [ - "IPython" - ]; - - meta = with lib; { - description = "IPython: Productive Interactive Computing"; - homepage = "http://ipython.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 878615936ce5..70c0005404d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9901,7 +9901,6 @@ in python2Full = python2.override{x11Support=true;}; python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; - python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; python38Full = python38.override{x11Support=true;}; @@ -9913,11 +9912,10 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 python39 python3Minimal pypy27 pypy36; + inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - python35Packages = python35.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08ef76a0246a..b9bddced45ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4411,8 +4411,6 @@ in { ipython = if isPy27 then callPackage ../development/python-modules/ipython/5.nix { } - else if isPy35 then - callPackage ../development/python-modules/ipython/7.9.nix { } else callPackage ../development/python-modules/ipython { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 2d7f0883ca25..ca64c4d975cb 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -269,7 +269,6 @@ in { ) super.ocaml-ng; python27 = super.python27.override { static = true; }; - python35 = super.python35.override { static = true; }; python36 = super.python36.override { static = true; }; python37 = super.python37.override { static = true; }; python38 = super.python38.override { static = true; }; From 8c7d49b726881187c57e29c49c8574b2404ee033 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 12 Aug 2020 21:57:40 -0700 Subject: [PATCH 2/2] docs: update python interpreter versions --- doc/languages-frameworks/python.section.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index dc10483ce694..7bee48773c29 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -640,8 +640,8 @@ and in this case the `python38` interpreter is automatically used. ### Interpreters -Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as -respectively `python27`, `python35`, `python36`, `python37` and `python38`. The +Versions 2.7, 3.6, 3.7 and 3.8 of the CPython interpreter are available as +respectively `python27`, `python36`, `python37` and `python38`. The aliases `python2` and `python3` correspond to respectively `python27` and `python38`. The default interpreter, `python`, maps to `python2`. The PyPy interpreters compatible with Python 2.7 and 3 are available as `pypy27` and @@ -689,15 +689,16 @@ attribute set is created for each available Python interpreter. The available sets are * `pkgs.python27Packages` -* `pkgs.python35Packages` * `pkgs.python36Packages` * `pkgs.python37Packages` +* `pkgs.python38Packages` +* `pkgs.python39Packages` * `pkgs.pypyPackages` and the aliases * `pkgs.python2Packages` pointing to `pkgs.python27Packages` -* `pkgs.python3Packages` pointing to `pkgs.python37Packages` +* `pkgs.python3Packages` pointing to `pkgs.python38Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages` #### `buildPythonPackage` function