cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #154540 from fabaff/bump-cherry-py

Browse source 
python3Packages.cherrypy: 18.6.0 -> 18.6.1
This commit is contained in:
Fabian Affolter 2022-01-11 14:48:31 +01:00 committed by GitHub
commit 49a7847f6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 66 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
pkgs/development/python-modules/cherrypy/default.nix
View file

@ -1,73 +1,99 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
, setuptools-scm
, cheroot, portend, more-itertools, zc_lockfile, routes
{ lib
, stdenv
, buildPythonPackage
, cheroot
, fetchPypi
, jaraco_collections
, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services
, fetchpatch
, more-itertools
, objgraph
, pathpy
, portend
, pytest-forked
, pytest-services
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, requests-toolbelt
, routes
, setuptools-scm
, simplejson
, zc_lockfile
}:
buildPythonPackage rec {
pname = "cherrypy";
version = "18.6.0";
version = "18.6.1";
format = "setuptools";
disabled = !isPy3k;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "CherryPy";
inherit version;
sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n";
hash = "sha256-8z6HKG57PjCeBOciXY5JOC2dd3PmCSJB1/YTiTxWNJU=";
};
patches = [
# 1/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/59c0e19d7df8680e36afc96756dce72435121448.patch";
sha256 = "1jachbvp505gndccdhny0c3grzdrmvmbzq4kw55jx93ay94ni6p0";
})
# 2/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/4a6287b73539adcb7b0ae72d69644a1ced1f7eaa.patch";
sha256 = "0nz40qmgxknkbjsdzfzcqfxdsmsxx3v104fb0h04yvs76mqvw3i4";
})
# 3/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/commit/3bae7f06868553b006915f05ff14d86163f59a7d.patch";
sha256 = "1z0bv23ybyw87rf1i8alsdi3gc2bzmdj9d0kjsghdkvi3zdp4n8q";
})
nativeBuildInputs = [
setuptools-scm
];
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
cheroot
portend
more-itertools
zc_lockfile
jaraco_collections
# optional
routes
simplejson
];
checkInputs = [
objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services
objgraph
pathpy
pytest-forked
pytest-services
pytestCheckHook
requests-toolbelt
];
# Keyboard interrupt ends test suite run
# daemonize and autoreload tests have issue with sockets within sandbox
# Disable doctest plugin because times out
checkPhase = ''
substituteInPlace pytest.ini --replace "--doctest-modules" ""
pytest \
-k 'not KeyboardInterrupt and not daemonize and not Autoreload' \
--deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
--deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
${lib.optionalString stdenv.isDarwin
"--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block --deselect=cherrypy/test/test_config_server.py"}
preCheck = ''
# Disable doctest plugin because times out
substituteInPlace pytest.ini \
--replace "--doctest-modules" "-vvv"
sed -i "/--cov/d" pytest.ini
'';
pytestFlagsArray = [
"-W"
"ignore::DeprecationWarning"
];
disabledTests = [
# Keyboard interrupt ends test suite run
"KeyboardInterrupt"
# daemonize and autoreload tests have issue with sockets within sandbox
"daemonize"
"Autoreload"
] ++ lib.optionals stdenv.isDarwin [
"test_block"
];
disabledTestPaths = lib.optionals stdenv.isDarwin [
"cherrypy/test/test_config_server.py"
];
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [
"cherrypy"
];
meta = with lib; {
description = "Object-oriented HTTP framework";
homepage = "https://www.cherrypy.org";
description = "A pythonic, object-oriented HTTP framework";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}