python2Packages.typing: we no longer need it for Python 3
This commit is contained in:
Frederik Rietdijk
parent
c57d51f1ab
commit
3904d4d477
25 changed files with 40 additions and 28 deletions
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, isPy27, isPyPy, python, pycares, typing
|
||||
, isPy27, isPyPy, python, pycares, typing ? null
|
||||
, trollius ? null
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, typing, aiohttp
|
||||
, typing ? null, aiohttp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, six
|
||||
, sphinx
|
||||
, toolz
|
||||
, typing
|
||||
, typing ? null
|
||||
, vega_datasets
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, toml
|
||||
, typing
|
||||
, typing ? null
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, isPy27
|
||||
, aenum
|
||||
, wrapt
|
||||
, typing
|
||||
, typing ? null
|
||||
, pyserial
|
||||
, nose
|
||||
, mock
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, click
|
||||
, future
|
||||
, pathlib2
|
||||
, typing
|
||||
, typing ? null
|
||||
, lxml
|
||||
, xlwt
|
||||
, xlrd
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
, pyyaml
|
||||
, setuptools
|
||||
, six
|
||||
, typing
|
||||
, typing ? null
|
||||
, watchdog
|
||||
, wheel
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
lib,
|
||||
nose,
|
||||
six,
|
||||
typing,
|
||||
typing ? null,
|
||||
isPy27,
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
, six
|
||||
, swagger-ui-bundle
|
||||
, testfixtures
|
||||
, typing
|
||||
, typing ? null
|
||||
, ujson
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, pythonOlder
|
||||
, decorator
|
||||
, requests
|
||||
, typing
|
||||
, typing ? null
|
||||
, configparser
|
||||
, click
|
||||
, freezegun
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, shortuuid
|
||||
, six
|
||||
, tox
|
||||
, typing
|
||||
, typing ? null
|
||||
, vobject
|
||||
, werkzeug
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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,9 +4,9 @@
|
|||
, fetchPypi
|
||||
, six
|
||||
, appdirs
|
||||
, scandir
|
||||
, scandir ? null
|
||||
, backports_os ? null
|
||||
, typing
|
||||
, typing ? null
|
||||
, pytz
|
||||
, enum34
|
||||
, pyftpdlib
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ buildPythonPackage, lib, fetchFromGitHub, pytest
|
||||
, typing, funcsigs, pythonOlder
|
||||
, typing ? null, funcsigs ? null, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing }:
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing ? null }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hyperlink";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
, setuptools_scm
|
||||
, toml
|
||||
, importlib-metadata
|
||||
, typing
|
||||
, singledispatch
|
||||
, typing ? null
|
||||
, singledispatch ? null
|
||||
, pythonOlder
|
||||
, python
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, tomlkit
|
||||
, typing
|
||||
, typing ? null
|
||||
, virtualenv
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
, sphinxcontrib-qthelp
|
||||
, sphinxcontrib-serializinghtml
|
||||
, sphinxcontrib-websupport
|
||||
, typing
|
||||
, typing ? null
|
||||
, setuptools
|
||||
, packaging
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, enum34, functools32, typing
|
||||
, enum34, functools32, typing ? null
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 { };
|
||||
|
||||
|
|
|
|||
|
|
@ -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 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue