python310Packages.cchardet: Drop in favor of faust-cchardet
The former packages has seen its last release in 2020-10 and can be considered abandoned. Meanwhile a new fork has appeared in faust-cchardet, that we're going to use in its place. Co-Authored-By: Robert Schütz <nix@dotlambda.de>
This commit is contained in:
Martin Weinelt
parent
f0443b2843
commit
1bd4b71a35
12 changed files with 15 additions and 73 deletions
|
|
@ -99,11 +99,11 @@ stdenv.mkDerivation rec {
|
|||
setupPyBuildFlags = [ "--enable=load_extension" ];
|
||||
}))
|
||||
beautifulsoup4
|
||||
cchardet
|
||||
css-parser
|
||||
cssselect
|
||||
python-dateutil
|
||||
dnspython
|
||||
faust-cchardet
|
||||
feedparser
|
||||
html2text
|
||||
html5-parser
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
, aiosignal
|
||||
, aiodns
|
||||
, brotli
|
||||
, cchardet
|
||||
, faust-cchardet
|
||||
, asynctest
|
||||
, typing-extensions
|
||||
, idna-ssl
|
||||
|
|
@ -66,7 +66,7 @@ buildPythonPackage rec {
|
|||
aiosignal
|
||||
aiodns
|
||||
brotli
|
||||
cchardet
|
||||
faust-cchardet
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
asynctest
|
||||
typing-extensions
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cython
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cchardet";
|
||||
version = "2.1.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython # pending https://github.com/PyYoshi/cChardet/pull/78 being released to PyPI
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cchardet"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ nose ];
|
||||
|
||||
# on non x86-64 some charsets are identified as their superset, so we skip these tests (last checked with version 2.1.7)
|
||||
preCheck = ''
|
||||
cp -R src/tests $TMPDIR
|
||||
pushd $TMPDIR
|
||||
'' + lib.optionalString (stdenv.hostPlatform.system != "x86_64-linux") ''
|
||||
rm $TMPDIR/tests/testdata/th/tis-620.txt # identified as iso-8859-11, which is fine for all practical purposes
|
||||
rm $TMPDIR/tests/testdata/ga/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes
|
||||
rm $TMPDIR/tests/testdata/fi/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
nosetests
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
postCheck = ''
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "High-speed universal character encoding detector";
|
||||
homepage = "https://github.com/PyYoshi/cChardet";
|
||||
license = lib.licenses.mpl11;
|
||||
maintainers = with lib.maintainers; [ ivan ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cchardet
|
||||
, chardet
|
||||
, faust-cchardet
|
||||
, pandas
|
||||
, regex
|
||||
, tabview
|
||||
|
|
@ -28,8 +28,8 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cchardet
|
||||
chardet
|
||||
faust-cchardet
|
||||
pandas
|
||||
regex
|
||||
tabview
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, aiohttp
|
||||
, aiodns
|
||||
, brotli
|
||||
, cchardet
|
||||
, faust-cchardet
|
||||
, orjson
|
||||
, pynacl
|
||||
}:
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
aiodns
|
||||
aiohttp
|
||||
brotli
|
||||
cchardet
|
||||
faust-cchardet
|
||||
orjson
|
||||
pynacl
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, attrs
|
||||
, brotlipy
|
||||
, buildPythonPackage
|
||||
, cchardet
|
||||
, faust-cchardet
|
||||
, click
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
|
|
@ -47,9 +47,9 @@ buildPythonPackage rec {
|
|||
async-timeout
|
||||
attrs
|
||||
brotlipy
|
||||
cchardet
|
||||
click
|
||||
colorama
|
||||
faust-cchardet
|
||||
halo
|
||||
requests
|
||||
rich
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
azure-mgmt-storage
|
||||
azure-storage-blob
|
||||
bcrypt
|
||||
cchardet
|
||||
faust-cchardet
|
||||
deepdiff
|
||||
feedparser
|
||||
iso8601
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ with python.pkgs; buildPythonApplication rec {
|
|||
autobahn
|
||||
fb-re2
|
||||
websockets
|
||||
cchardet
|
||||
faust-cchardet
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
# aiohttp[speedups]
|
||||
, aiodns
|
||||
, brotlipy
|
||||
, cchardet
|
||||
, faust-cchardet
|
||||
, pillow
|
||||
, pytestCheckHook
|
||||
, xmlschema
|
||||
|
|
@ -57,7 +57,7 @@ buildPythonApplication rec {
|
|||
# aiohttp[speedups]
|
||||
aiodns
|
||||
brotlipy
|
||||
cchardet
|
||||
faust-cchardet
|
||||
# needed by brotlipy
|
||||
pillow
|
||||
setuptools
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ python3.pkgs.buildPythonApplication rec {
|
|||
aiodns
|
||||
aiohttp
|
||||
appdirs
|
||||
cchardet
|
||||
click
|
||||
colorama
|
||||
faust-cchardet
|
||||
prompt-toolkit
|
||||
xpath-expressions
|
||||
];
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ mapAliases ({
|
|||
bt_proximity = bt-proximity; # added 2021-07-02
|
||||
BTrees = btrees; # added 2023-02-19
|
||||
carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
|
||||
cchardet = faust-cchardet; # added 2023-03-02
|
||||
class-registry = phx-class-registry; # added 2021-10-05
|
||||
codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02
|
||||
ColanderAlchemy = colanderalchemy; # added 2023-02-19
|
||||
|
|
|
|||
|
|
@ -1621,8 +1621,6 @@ self: super: with self; {
|
|||
|
||||
cccolutils = callPackage ../development/python-modules/cccolutils { };
|
||||
|
||||
cchardet = callPackage ../development/python-modules/cchardet { };
|
||||
|
||||
cdcs = callPackage ../development/python-modules/cdcs { };
|
||||
|
||||
celery = callPackage ../development/python-modules/celery { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue