JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python2Packages.typing: we no longer need it for Python 3

Browse Source
This commit is contained in:
Frederik Rietdijk 2021-03-25 08:23:40 +01:00
parent c57d51f1ab
commit 3904d4d477
25 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/aiodns/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
, isPy27, isPyPy, python, pycares, typing
, isPy27, isPyPy, python, pycares, typing ? null
, trollius ? null
}:

2
pkgs/development/python-modules/aiohttp-cors/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
, typing, aiohttp
, typing ? null, aiohttp
}:
buildPythonPackage rec {

2
pkgs/development/python-modules/altair/default.nix
View File

@ -12,7 +12,7 @@
, six
, sphinx
, toolz
, typing
, typing ? null
, vega_datasets
}:

2
pkgs/development/python-modules/build/default.nix
View File

@ -12,7 +12,7 @@
, pytestCheckHook
, pythonOlder
, toml
, typing
, typing ? null
}:
buildPythonPackage rec {

2
pkgs/development/python-modules/can/default.nix
View File

@ -5,7 +5,7 @@
, isPy27
, aenum
, wrapt
, typing
, typing ? null
, pyserial
, nose
, mock

2
pkgs/development/python-modules/canmatrix/default.nix
View File

@ -7,7 +7,7 @@
, click
, future
, pathlib2
, typing
, typing ? null
, lxml
, xlwt
, xlrd

2
pkgs/development/python-modules/chalice/default.nix
View File

@ -15,7 +15,7 @@
, pyyaml
, setuptools
, six
, typing
, typing ? null
, watchdog
, wheel
}:

2
pkgs/development/python-modules/class-registry/default.nix
View File

@ -4,7 +4,7 @@
lib,
nose,
six,
typing,
typing ? null,
isPy27,
}:

2
pkgs/development/python-modules/clikit/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, isPy27, pythonAtLeast
, pylev, pastel, typing, enum34, crashtest }:
, pylev, pastel, typing ? null, enum34 ? null, crashtest }:
buildPythonPackage rec {
pname = "clikit";

2
pkgs/development/python-modules/connexion/default.nix
View File

@ -26,7 +26,7 @@
, six
, swagger-ui-bundle
, testfixtures
, typing
, typing ? null
, ujson
}:

2
pkgs/development/python-modules/curtsies/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }:
{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing ? null}:
buildPythonPackage rec {
pname = "curtsies";

2
pkgs/development/python-modules/datadog/default.nix
View File

@ -4,7 +4,7 @@
, pythonOlder
, decorator
, requests
, typing
, typing ? null
, configparser
, click
, freezegun

2
pkgs/development/python-modules/django-extensions/default.nix
View File

@ -11,7 +11,7 @@
, shortuuid
, six
, tox
, typing
, typing ? null
, vobject
, werkzeug
}:

13
pkgs/development/python-modules/eth-hash/default.nix
View File

@ -1,5 +1,7 @@
{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto,
pycryptodome }:
{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto
, pycryptodome
, eth-utils
}:
buildPythonPackage rec {
pname = "eth-hash";
@ -12,7 +14,12 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
propagatedBuildInputs = [ pysha3 pycrypto pycryptodome ];
propagatedBuildInputs = [
eth-utils
pysha3
pycrypto
pycryptodome
];
# setuptools-markdown uses pypandoc which is broken at the moment
preConfigure = ''

2
pkgs/development/python-modules/flake8/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
, mock, pytest, pytestrunner
, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata
, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata
}:
buildPythonPackage rec {

4
pkgs/development/python-modules/fs/default.nix
View File

@ -4,9 +4,9 @@
, fetchPypi
, six
, appdirs
, scandir
, scandir ? null
, backports_os ? null
, typing
, typing ? null
, pytz
, enum34
, pyftpdlib

2
pkgs/development/python-modules/gentools/default.nix
View File

@ -1,5 +1,5 @@
{ buildPythonPackage, lib, fetchFromGitHub, pytest
, typing, funcsigs, pythonOlder
, typing ? null, funcsigs ? null, pythonOlder
}:
buildPythonPackage rec {

2
pkgs/development/python-modules/hyperlink/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing }:
{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing ? null }:
buildPythonPackage rec {
pname = "hyperlink";

4
pkgs/development/python-modules/importlib-resources/default.nix
View File

@ -4,8 +4,8 @@
, setuptools_scm
, toml
, importlib-metadata
, typing
, singledispatch
, typing ? null
, singledispatch ? null
, pythonOlder
, python
}:

2
pkgs/development/python-modules/poetry-core/default.nix
View File

@ -7,7 +7,7 @@
, pytest-mock
, pytestCheckHook
, tomlkit
, typing
, typing ? null
, virtualenv
}:

2
pkgs/development/python-modules/sphinx/default.nix
View File

@ -26,7 +26,7 @@
, sphinxcontrib-qthelp
, sphinxcontrib-serializinghtml
, sphinxcontrib-websupport
, typing
, typing ? null
, setuptools
, packaging
}:

2
pkgs/development/python-modules/tomlkit/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, enum34, functools32, typing
, enum34, functools32, typing ? null
}:
buildPythonPackage rec {

5
pkgs/development/python-modules/typing/default.nix
View File

@ -1,4 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, python }:
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, python
, pythonAtLeast }:
let
testDir = if isPy3k then "src" else "python2";
@ -12,6 +13,8 @@ in buildPythonPackage rec {
sha256 = "1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9";
};
disabled = pythonAtLeast "3.5";
# Error for Python3.6: ImportError: cannot import name 'ann_module'
# See https://github.com/python/typing/pull/280
# Also, don't bother on PyPy: AssertionError: TypeError not raised

2
pkgs/top-level/python-packages.nix
View File

@ -7906,7 +7906,7 @@ in {
typesystem = callPackage ../development/python-modules/typesystem { };
typing = callPackage ../development/python-modules/typing { };
typing = null;
typing-extensions = callPackage ../development/python-modules/typing-extensions { };

2
pkgs/top-level/python2-packages.nix
View File

@ -599,6 +599,8 @@ with self; with super; {
TurboCheetah = callPackage ../development/python-modules/TurboCheetah { };
typing = callPackage ../development/python-modules/typing { };
ujson = callPackage ../development/python-modules/ujson/2.nix { };
umemcache = callPackage ../development/python-modules/umemcache { };