diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/python-modules/flake8-polyfill | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/flake8-polyfill')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix index 050a6d4f9c8a..60ee3558d1d4 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -1,6 +1,12 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi , flake8 -, mock, pep8, pytest }: +, mock +, pep8 +, pytestCheckHook +}: buildPythonPackage rec { pname = "flake8-polyfill"; @@ -11,12 +17,6 @@ buildPythonPackage rec { sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4"; }; - postPatch = '' - # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. - substituteInPlace setup.cfg \ - --replace pytest 'tool:pytest' - ''; - propagatedBuildInputs = [ flake8 ]; @@ -24,13 +24,28 @@ buildPythonPackage rec { checkInputs = [ mock pep8 - pytest + pytestCheckHook + ]; + + patches = [ + # Skip unnecessary tests on Flake8, https://github.com/PyCQA/pep8-naming/pull/181 + (fetchpatch { + name = "skip-tests.patch"; + url = "https://github.com/PyCQA/flake8-polyfill/commit/3cf414350e82ceb835ca2edbd5d5967d33e9ff35.patch"; + sha256 = "mElZafodq8dF3wLO/LOqwFb7eLMsPLlEjNSu5AWqets="; + }) ]; - checkPhase = '' - pytest tests + postPatch = '' + # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. + substituteInPlace setup.cfg \ + --replace pytest 'tool:pytest' ''; + pythonImportsCheck = [ + "flake8_polyfill" + ]; + meta = with lib; { homepage = "https://gitlab.com/pycqa/flake8-polyfill"; description = "Polyfill package for Flake8 plugins"; |