Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python3Packages: format with nixfmt #313628

Merged
merged 3 commits into from
May 22, 2024
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,6 @@ fb0e5be84331188a69b3edd31679ca6576edb75a

# k3s: format with nixfmt-rfc-style
6cfcd3c75428ede517bc6b15a353d704837a2830

# python3Packages: format with nixfmt
59b1aef59071cae6e87859dc65de973d2cc595c0
9 changes: 5 additions & 4 deletions pkgs/development/python-modules/3to2/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
{
lib,
buildPythonPackage,
fetchPypi,
pytest,
}:

buildPythonPackage rec {
Expand Down
21 changes: 10 additions & 11 deletions pkgs/development/python-modules/a2wsgi/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ lib
, buildPythonPackage
, fetchPypi
, asgiref
, httpx
, pdm-backend
, pytest-asyncio
, pytestCheckHook
{
lib,
buildPythonPackage,
fetchPypi,
asgiref,
httpx,
pdm-backend,
pytest-asyncio,
pytestCheckHook,
}:

buildPythonPackage rec {
Expand All @@ -18,9 +19,7 @@ buildPythonPackage rec {
hash = "sha256-UOgaxVqmCfosZm5CuswlxCTIiEzmBy8afpAhFLfuXWM=";
};

nativeBuildInputs = [
pdm-backend
];
nativeBuildInputs = [ pdm-backend ];

nativeCheckInputs = [
asgiref
Expand Down
29 changes: 11 additions & 18 deletions pkgs/development/python-modules/aadict/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
, pynose
, setuptools
{
lib,
buildPythonPackage,
fetchPypi,
six,
pynose,
setuptools,
}:

buildPythonPackage rec {
Expand All @@ -16,21 +17,13 @@ buildPythonPackage rec {
hash = "sha256-p3MorFXbtXNdqZRBhwJRvv4TX2h6twenoXhWE2OydwQ=";
};

build-system = [
setuptools
];
build-system = [ setuptools ];

dependencies = [
six
];
dependencies = [ six ];

nativeCheckInputs = [
pynose
];
nativeCheckInputs = [ pynose ];

pythonImportsCheck = [
"aadict"
];
pythonImportsCheck = [ "aadict" ];

meta = with lib; {
description = "An auto-attribute dict (and a couple of other useful dict functions)";
Expand Down
7 changes: 6 additions & 1 deletion pkgs/development/python-modules/aafigure/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{ lib, buildPythonPackage, fetchPypi, pillow }:
{
lib,
buildPythonPackage,
fetchPypi,
pillow,
}:

buildPythonPackage rec {
pname = "aafigure";
Expand Down
53 changes: 25 additions & 28 deletions pkgs/development/python-modules/aardwolf/default.nix
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
{ lib
, stdenv
, arc4
, asn1crypto
, asn1tools
, asyauth
, asysocks
, buildPythonPackage
, cargo
, colorama
, fetchFromGitHub
, iconv
, minikerberos
, pillow
, pyperclip
, pythonOlder
, rustPlatform
, rustc
, setuptools-rust
, tqdm
, unicrypto
, winsspi
{
lib,
stdenv,
arc4,
asn1crypto,
asn1tools,
asyauth,
asysocks,
buildPythonPackage,
cargo,
colorama,
fetchFromGitHub,
iconv,
minikerberos,
pillow,
pyperclip,
pythonOlder,
rustPlatform,
rustc,
setuptools-rust,
tqdm,
unicrypto,
winsspi,
}:

buildPythonPackage rec {
Expand Down Expand Up @@ -65,16 +66,12 @@ buildPythonPackage rec {
tqdm
unicrypto
winsspi
] ++ lib.optionals (stdenv.isDarwin) [
iconv
];
] ++ lib.optionals (stdenv.isDarwin) [ iconv ];

# Module doesn't have tests
doCheck = false;

pythonImportsCheck = [
"aardwolf"
];
pythonImportsCheck = [ "aardwolf" ];

meta = with lib; {
description = "Asynchronous RDP protocol implementation";
Expand Down
27 changes: 12 additions & 15 deletions pkgs/development/python-modules/abjad/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{ lib
, buildPythonPackage
, fetchPypi
, ply
, roman
, uqbar
, pythonOlder
, pytestCheckHook
, lilypond
{
lib,
buildPythonPackage,
fetchPypi,
ply,
roman,
uqbar,
pythonOlder,
pytestCheckHook,
lilypond,
}:

buildPythonPackage rec {
Expand All @@ -27,13 +28,9 @@ buildPythonPackage rec {
uqbar
];

buildInputs = [
lilypond
];
buildInputs = [ lilypond ];

nativeCheckInputs = [
pytestCheckHook
];
nativeCheckInputs = [ pytestCheckHook ];

postPatch = ''
substituteInPlace abjad/io.py \
Expand Down
11 changes: 5 additions & 6 deletions pkgs/development/python-modules/about-time/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, fetchPypi
, buildPythonPackage
{
lib,
fetchPypi,
buildPythonPackage,
}:

buildPythonPackage rec {
Expand All @@ -19,9 +20,7 @@ buildPythonPackage rec {

doCheck = false;

pythonImportsCheck = [
"about_time"
];
pythonImportsCheck = [ "about_time" ];

meta = with lib; {
description = "A cool helper for tracking time and throughput of code blocks, with beautiful human friendly renditions";
Expand Down
19 changes: 8 additions & 11 deletions pkgs/development/python-modules/absl-py/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{ buildPythonPackage
, lib
, fetchPypi
, setuptools
, six
{
buildPythonPackage,
lib,
fetchPypi,
setuptools,
six,
}:

buildPythonPackage rec {
Expand All @@ -15,13 +16,9 @@ buildPythonPackage rec {
hash = "sha256-eCB5DvuzFnOc3otOGTVyQ/w2CKFSAkKIUT3ZaNfZWf8=";
};

nativeBuildInputs = [
setuptools
];
nativeBuildInputs = [ setuptools ];

propagatedBuildInputs = [
six
];
propagatedBuildInputs = [ six ];

# checks use bazel; should be revisited
doCheck = false;
Expand Down
Loading