Merge pull request #236265 from GaetanLepage/mypy

python3Packages.mypy: 1.0.1 -> 1.3.0
This commit is contained in:
Martin Weinelt 2023-06-18 12:50:17 +02:00 committed by GitHub
commit 1a3579fd94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 78 additions and 116 deletions

View file

@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
mock
mypy
mypy-extensions
dbus-python
pygobject3
pyinotify

View file

@ -2,9 +2,7 @@
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pytest-cov
, pytestCheckHook
, pytest-mypy
, pythonOlder
, tenacity
}:
@ -21,14 +19,18 @@ buildPythonPackage rec {
sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9";
};
postPatch = ''
substituteInPlace tox.ini \
--replace "--cov --cov-append --cov-fail-under=30 --cov-report=" "" \
--replace "--mypy" ""
'';
propagatedBuildInputs = [
async-timeout
tenacity
];
nativeCheckInputs = [
pytest-cov
pytest-mypy
pytestCheckHook
];

View file

@ -4,7 +4,6 @@
, typing-inspect
, marshmallow-enum
, hypothesis
, mypy
, pytestCheckHook
}:
@ -26,14 +25,14 @@ buildPythonPackage rec {
nativeCheckInputs = [
hypothesis
mypy
pytestCheckHook
];
disabledTests = [
disabledTestPaths = [
# fails with the following error and avoid dependency on mypy
# mypy_main(None, text_io, text_io, [__file__], clean_exit=True)
# TypeError: main() takes at most 4 arguments (5 given)
"test_type_hints"
"tests/test_annotations.py"
];
pythonImportsCheck = [ "dataclasses_json" ];

View file

@ -2,7 +2,6 @@
, buildPythonPackage
, duckdb
, google-cloud-storage
, mypy
, numpy
, pandas
, psutil
@ -15,9 +14,8 @@ buildPythonPackage rec {
inherit (duckdb) pname version src patches;
format = "setuptools";
# we can't use sourceRoot otherwise patches don't apply, because the patches
# apply to the C++ library
postPatch = ''
# we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library
cd tools/pythonpkg
# 1. let nix control build cores
@ -25,6 +23,9 @@ buildPythonPackage rec {
substituteInPlace setup.py \
--replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" \
--replace "setuptools_scm<7.0.0" "setuptools_scm"
# avoid dependency on mypy
rm tests/stubs/test_stubs.py
'';
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -41,7 +42,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
google-cloud-storage
mypy
psutil
pytestCheckHook
];

View file

@ -1,18 +1,18 @@
{ lib
, fetchPypi
, fetchFromGitHub
, buildPythonPackage
, normality
, mypy
, coverage
, nose
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "fingerprints";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-GZmurg3rpD081QZW/LUKWblhsQQSS6lg9O7y/kGy4To=";
src = fetchFromGitHub {
owner = "alephdata";
repo = "fingerprints";
rev = version;
hash = "sha256-rptBM08dvivfglPvl3PZd9V/7u2SHbJ/BxfVHNGMt3A=";
};
propagatedBuildInputs = [
@ -20,15 +20,9 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
mypy
coverage
nose
pytestCheckHook
];
checkPhase = ''
nosetests
'';
pythonImportsCheck = [
"fingerprints"
];

View file

@ -2,7 +2,6 @@
, buildPythonPackage
, cryptography
, fetchFromGitHub
, mypy
, pyjwt
, pytestCheckHook
, pythonOlder
@ -34,7 +33,6 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
mypy
pytestCheckHook
responses
];

View file

@ -3,7 +3,6 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, mypy
, typing-extensions
}:
@ -21,12 +20,15 @@ buildPythonPackage rec {
hash = "sha256-yW+pmAryBp6bvjolN91ACDkk5zxvKfu4nRLQSy71kqs=";
};
postPatch = ''
rm tests/conftest.py
'';
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
typing-extensions
];
nativeCheckInputs = [
mypy
pytestCheckHook
];
@ -35,6 +37,11 @@ buildPythonPackage rec {
"testMypyImmu"
];
disabledTestPaths = [
# avoid dependency on mypy
"tests/test_mypy.py"
];
pythonImportsCheck = [
"immutables"
];

View file

@ -2,10 +2,8 @@
, stdenv
, buildPythonPackage
, colorama
, fetchpatch
, fetchFromGitHub
, freezegun
, mypy
, pytestCheckHook
, pythonOlder
}:
@ -28,14 +26,19 @@ buildPythonPackage rec {
pytestCheckHook
colorama
freezegun
mypy
];
disabledTestPaths = lib.optionals stdenv.isDarwin [
disabledTestPaths = [
"tests/test_type_hinting.py" # avoid dependency on mypy
] ++ lib.optionals stdenv.isDarwin [
"tests/test_multiprocessing.py"
];
disabledTests = lib.optionals stdenv.isDarwin [
disabledTests = [
# fails on some machine configurations
# AssertionError: assert '' != ''
"test_file_buffering"
] ++ lib.optionals stdenv.isDarwin [
"test_rotation_and_retention"
"test_rotation_and_retention_timed_file"
"test_renaming"

View file

@ -3,7 +3,6 @@
, fetchFromGitHub
, setuptools-scm
, pytestCheckHook
, pytest-mypy-plugins
, typing-extensions
, qtpy
, pyside2
@ -27,7 +26,7 @@
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ];
nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins ];
nativeCheckInputs = [ pytestCheckHook ];
doCheck = false; # Reports "Fatal Python error"

View file

@ -2,7 +2,6 @@
, stdenv
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonOlder
# build-system
@ -32,7 +31,7 @@
buildPythonPackage rec {
pname = "mypy";
version = "1.0.1";
version = "1.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -41,24 +40,9 @@ buildPythonPackage rec {
owner = "python";
repo = "mypy";
rev = "refs/tags/v${version}";
hash = "sha256-vxPEUDC6fkYYiOl5nHf0qwMgPDC+9Vw56eTUQ174raQ=";
hash = "sha256-dfKuIyzgZo5hAZHighpXH78dHJ1PMbyCakyxF34CnMQ=";
};
patches = [
# Fix compatibility with setupptools>=67.4.0
(fetchpatch {
# https://github.com/python/mypy/pull/14781
url = "https://github.com/python/mypy/commit/ab7b69a0532a5fe976c9c2a1b713d82d630692a4.patch";
hash = "sha256-dtzmoOZP3tOtxrBVhgqpdv+rnrTjTKHxQhBieuJXRtA=";
})
(fetchpatch {
# https://github.com/python/mypy/pull/14787
url = "https://github.com/python/mypy/commit/243f584d43e6eb316920f3155067ce7c1b65d473.patch";
hash = "sha256-uuh3S5ZyuJeTXyMvav2uSEao2qq23xMjK8rJjkY8RCY=";
includes = [ "mypyc/build.py" ];
})
];
nativeBuildInputs = [
mypy-extensions
setuptools

View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "mypy-extensions";
version = "0.4.3";
version = "1.0.0";
src = fetchFromGitHub {
owner = "python";
repo = "mypy_extensions";
rev = version;
hash = "sha256-JjhbxX5DBAbcs1o2fSWywz9tot792q491POXiId+NyI=";
hash = "sha256-gOfHC6dUeBE7SsWItpUHHIxW3wzhPM5SuGW1U8P7DD0=";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing;

View file

@ -5,7 +5,6 @@
, pytestCheckHook
, beartype
, invoke
, mypy
, numpy
, pandas
, feedparser
@ -34,7 +33,6 @@ buildPythonPackage rec {
beartype
feedparser
invoke
mypy
pandas
pytestCheckHook
typeguard

View file

@ -4,7 +4,6 @@
, pillow
, poetry-core
, pytest-benchmark
, pytest-mypy
, pytestCheckHook
, pythonOlder
}:
@ -31,13 +30,10 @@ buildPythonPackage rec {
nativeCheckInputs = [
pillow
pytest-benchmark
pytest-mypy
pytestCheckHook
];
pytestFlagsArray = [
# Incompatible types in assignment
#"--mypy"
"--benchmark-disable"
];

View file

@ -8,7 +8,6 @@
, freezegun
, jsonpickle
, munch
, mypy
, pyserial
, pytest-aiohttp
, pytest-asyncio
@ -48,7 +47,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
freezegun
jsonpickle
mypy
pytest-aiohttp
pytest-asyncio
pytestCheckHook

View file

@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pytest-mypy
, pythonOlder
, redis
}:
@ -25,7 +24,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
pytest-mypy
];
disabledTests = [
@ -41,6 +39,5 @@ buildPythonPackage rec {
homepage = "https://github.com/WoLpH/portalocker";
license = licenses.psfl;
maintainers = with maintainers; [ jonringer ];
platforms = platforms.unix; # Windows has a dependency on pypiwin32
};
}

View file

@ -6,7 +6,6 @@
, mypy-extensions
, numpy
, pydantic
, pytest-mypy-plugins
, pytestCheckHook
, pythonOlder
, typing-extensions
@ -42,7 +41,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
numpy
pydantic
pytest-mypy-plugins
pytestCheckHook
wrapt
];

View file

@ -4,7 +4,6 @@
, fetchFromGitHub
, loguru
, pytest-asyncio
, pytest-mypy
, pytestCheckHook
, pythonOlder
}:
@ -24,8 +23,9 @@ buildPythonPackage rec {
};
postPatch = ''
sed -i '/--cov/d' pytest.ini
sed -i '/--mypy/d' pytest.ini
sed -i pytest.ini \
-e '/--cov/d' \
-e '/--mypy/d'
'';
passthru.optional-dependencies = {
@ -36,7 +36,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-asyncio
pytest-mypy
pytestCheckHook
] ++ passthru.optional-dependencies.loguru;

View file

@ -8,7 +8,6 @@
, libinput
, libxkbcommon
, mpd2
, mypy
, pango
, pkg-config
, psutil
@ -82,11 +81,6 @@ buildPythonPackage rec {
libxkbcommon
];
# for `qtile check`, needs `stubtest` and `mypy` commands
makeWrapperArgs = [
"--suffix PATH : ${lib.makeBinPath [ mypy ]}"
];
doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
meta = with lib; {

View file

@ -5,13 +5,9 @@
, fetchFromGitHub
, httpx
, hypothesis
, mypy
, poetry-core
, pytestCheckHook
, pytest-aio
, pytest-cov
, pytest-mypy
, pytest-mypy-plugins
, pytest-subtests
, setuptools
, trio
@ -30,6 +26,12 @@ buildPythonPackage rec {
hash = "sha256-28WYjrjmu3hQ8+Snuvl3ykTd86eWYI97AE60p6SVwDQ=";
};
postPatch = ''
sed -i setup.cfg \
-e '/--cov.*/d' \
-e '/--mypy.*/d'
'';
nativeBuildInputs = [
poetry-core
];
@ -38,17 +40,17 @@ buildPythonPackage rec {
typing-extensions
];
preCheck = ''
rm -rf returns/contrib/mypy
'';
nativeCheckInputs = [
anyio
curio
httpx
hypothesis
mypy
pytestCheckHook
pytest-aio
pytest-cov
pytest-mypy
pytest-mypy-plugins
pytest-subtests
setuptools
trio
@ -58,7 +60,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Make your functions return something meaningful, typed, and safe!";
homepage = "returns.rtfd.io";
homepage = "https://github.com/dry-python/returns";
license = licenses.bsd2;
maintainers = [ maintainers.jessemoore ];
};

View file

@ -1,7 +1,6 @@
{ lib
, aiohttp
, asgiref
, backports-cached-property
, buildPythonPackage
, chalice
, channels
@ -16,7 +15,6 @@
, freezegun
, graphql-core
, libcst
, mypy
, opentelemetry-api
, opentelemetry-sdk
, poetry-core
@ -149,7 +147,6 @@ buildPythonPackage rec {
daphne
email-validator
freezegun
mypy
pytest-asyncio
pytest-emoji
pytest-mock
@ -168,6 +165,7 @@ buildPythonPackage rec {
"tests/django/test_dataloaders.py"
"tests/exceptions/"
"tests/http/"
"tests/mypy/test_plugin.py" # avoid dependency on mypy
"tests/schema/extensions/"
"tests/schema/test_dataloaders.py"
"tests/schema/test_lazy/"

View file

@ -2,7 +2,6 @@
, buildPythonPackage
, colorama
, fetchFromGitHub
, pytest-mypy
, pytestCheckHook
, pythonOlder
, regex
@ -28,7 +27,6 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytest-mypy
pytestCheckHook
];

View file

@ -4,7 +4,6 @@
, fetchFromGitHub
, future-typing
, inflection
, mypy
, orjson
, pandas
, pendulum
@ -45,7 +44,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
mypy
pydantic
sqlalchemy
pandas

View file

@ -1,5 +1,4 @@
{ lib
, isPy3k
, fetchFromGitHub
, buildPythonPackage
, flake8-import-order
@ -7,6 +6,7 @@
, tomli
, setuptools
, pytestCheckHook
, pythonAtLeast
, pythonOlder
}:
@ -15,7 +15,8 @@ buildPythonPackage rec {
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
# upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error
disabled = pythonOlder "3.7" || pythonAtLeast "3.11";
src = fetchFromGitHub {
owner = "sqlalchemyorg";

View file

@ -15,6 +15,11 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-e/gKBgbtjO2XYnAIdHDoVJWyP6cyvsuIFLrV/eqjces=";
};
postPatch = ''
# remove --cov* options provided to pytest
sed -i '/^addopts = "--cov/d' pyproject.toml
'';
nativeBuildInputs = with python3Packages; [
poetry-core
];
@ -41,9 +46,9 @@ python3Packages.buildPythonApplication rec {
pytestCheckHook
];
postPatch = ''
sed -i "/^addopts/d" pyproject.toml
'';
disabledTests = [
"test_checks" # broken because new mypy release added new checks
];
pythonImportsCheck = [
"refurb"

View file

@ -1,5 +1,5 @@
{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest
, pytest-cov, pytest-runner, lib, stringcase
{ buildPythonApplication, click, fetchPypi, hypothesis, pytest
, lib, stringcase
}:
buildPythonApplication rec {
@ -11,15 +11,14 @@ buildPythonApplication rec {
sha256 = "b2cb9d4670a6e12d14a446c10d857862e91af6e4526f607e08b41bde89953bb8";
};
postPatch = ''
sed -i setup.cfg \
-e '/--cov.*/d'
'';
nativeCheckInputs = [
hypothesis
mypy
pytest
pytest-cov
];
buildInputs = [
pytest-runner
];
propagatedBuildInputs = [

View file

@ -1,4 +1,4 @@
{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper
{ lib, pkgs, stdenv, fetchFromGitHub, python3, nix, git, makeWrapper
, runtimeShell }:
let self = stdenv.mkDerivation rec {
pname = "nix-pin";
@ -10,10 +10,7 @@ let self = stdenv.mkDerivation rec {
sha256 = "1pccvc0iqapms7kidrh09g5fdx44x622r5l9k7bkmssp3v4c68vy";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 mypy ];
checkPhase = ''
mypy bin/*
'';
buildInputs = [ python3 ];
installPhase = ''
mkdir "$out"
cp -r bin share "$out"