Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/async-lru/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ buildPythonPackage rec {
pytest-asyncio
];

pytestFlagsArray = [
"--asyncio-mode=strict"
];

disabledTests = [
# https://github.com/aio-libs/async-lru/issues/341
"test_alru_cache_deco"
Expand Down
24 changes: 0 additions & 24 deletions pkgs/development/python-modules/bitcoin-price-api/default.nix

This file was deleted.

41 changes: 32 additions & 9 deletions pkgs/development/python-modules/django-widget-tweaks/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
{ buildPythonPackage, fetchFromGitHub, python, lib, django }:
{ lib
, buildPythonPackage
, fetchFromGitHub

# native
, setuptools-scm

# propagated
, django

# tests
, python
}:

buildPythonPackage rec {
pname = "django-widget-tweaks";
Expand All @@ -11,15 +23,26 @@ buildPythonPackage rec {
sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h";
};

checkPhase = "${python.interpreter} runtests.py";
propagatedBuildInputs = [ django ];
SETUPTOOLS_SCM_PRETEND_VERSION = version;

nativeBuildInputs = [
setuptools-scm
];

propagatedBuildInputs = [
django
];

checkPhase = ''
${python.interpreter} -m django test --settings=tests.settings
'';

meta = with lib; {
description = "Tweak the form field rendering in templates, not in python-level form definitions.";
homepage = "https://github.com/jazzband/django-widget-tweaks";
license = licenses.mit;
maintainers = with maintainers; [
maxxk
];
description = "Tweak the form field rendering in templates, not in python-level form definitions.";
homepage = "https://github.com/jazzband/django-widget-tweaks";
license = licenses.mit;
maintainers = with maintainers; [
maxxk
];
};
}
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/hypothesmith/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,19 @@ buildPythonPackage rec {
sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922";
};

postPatch = ''
substituteInPlace setup.py \
--replace "lark-parser" "lark"
'';

propagatedBuildInputs = [ hypothesis lark libcst ];

checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ];

pytestFlagsArray = [
"--numprocesses $NIX_BUILD_CORES"
];

pythonImportsCheck = [ "hypothesmith" ];

meta = with lib; {
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/python-modules/keepalive/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ buildPythonPackage rec {
description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive";
homepage = "https://github.com/wikier/keepalive";
license = licenses.asl20;
broken = true; # uses use_2to3, which is no longer supported for setuptools>=58
};

}
27 changes: 0 additions & 27 deletions pkgs/development/python-modules/nose-cover3/default.nix

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ buildPythonPackage rec {
homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
broken = python.isPy3k; # uses use_2to3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since python2 moved out this would be never false. Why not delete it?

};
}
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/parse-type/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

buildPythonPackage rec {
pname = "parse-type";
version = "0.5.6";
version = "0.6.0";

src = fetchFromGitHub {
owner = "jenisys";
repo = "parse_type";
rev = "v${version}";
sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E=";
sha256 = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc=";
};

propagatedBuildInputs = [
Expand All @@ -29,7 +29,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pytest.ini \
--replace "--metadata PACKAGE_UNDER_TEST parse_type" "" \
--replace "--metadata PACKAGE_VERSION 0.5.6" "" \
--replace "--metadata PACKAGE_VERSION ${version}" "" \
--replace "--html=build/testing/report.html --self-contained-html" "" \
--replace "--junit-xml=build/testing/report.xml" ""
'';
Expand Down
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/portalocker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ buildPythonPackage rec {
pytest-mypy
];

disabledTests = [
"test_combined" # no longer compatible with setuptools>=58
];

meta = with lib; {
description = "A library to provide an easy API to file locking";
homepage = "https://github.com/WoLpH/portalocker";
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/pybind11/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ buildPythonPackage rec {
"tests/test_numpy_dtypes.py"
# no need to test internal packaging
"tests/extra_python_package/test_files.py"
# tests that try to parse setuptools stdout
"tests/extra_setuptools/test_setuphelper.py"
];

meta = with lib; {
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/readme_renderer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ buildPythonPackage rec {
disabledTests = [
# https://github.com/pypa/readme_renderer/issues/221
"test_GFM_"
# Relies on old distutils behaviour removed by setuptools (TypeError: dist must be a Distribution instance)
"test_valid_rst"
"test_invalid_rst"
"test_malicious_rst"
"test_invalid_missing"
"test_invalid_empty"
];

pythonImportsCheck = [
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/setuptools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

let
pname = "setuptools";
version = "57.2.0";
version = "60.8.2";

# Create an sdist of setuptools
sdist = stdenv.mkDerivation rec {
Expand All @@ -20,12 +20,13 @@ let
owner = "pypa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zFmndVoATNxfvDsacY+gj5bzIbbd/8ldbsJj4qOawTA=";
sha256 = "1mqpmbn58rx3g24dm6wnllx0xs97ampn2yga3qypqgwnh1nk477i";
name = "${pname}-${version}-source";
};

patches = [
./tag-date.patch
./setuptools-distutils-C++.patch
];

buildPhase = ''
Expand Down
Loading