Skip to content

Commit

Permalink
Merge pull request #259729 from natsukium/factory-boy
Browse files Browse the repository at this point in the history
python311Packages.factory-boy: rename from factory_boy
  • Loading branch information
mweinelt authored Oct 11, 2023
2 parents f19fb32 + abd8c26 commit 37773cd
Show file tree
Hide file tree
Showing 19 changed files with 31 additions and 30 deletions.
2 changes: 1 addition & 1 deletion nixos/tests/sqlite3-to-mysql.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
python3Packages.pytest
python3Packages.pytest-mock
python3Packages.pytest-timeout
python3Packages.factory_boy
python3Packages.factory-boy
python3Packages.docker # only needed so import does not fail
sqlite3-to-mysql
])
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/privacyidea/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let
doCheck = false;
});
# version 3.3.0+ does not support SQLAlchemy 1.3
factory_boy = super.factory_boy.overridePythonAttrs (oldAttrs: rec {
factory-boy = super.factory-boy.overridePythonAttrs (oldAttrs: rec {
version = "3.2.1";
src = oldAttrs.src.override {
inherit version;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/office/paperless-ngx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ python.pkgs.buildPythonApplication rec {

nativeCheckInputs = with python.pkgs; [
daphne
factory_boy
factory-boy
imagehash
pdfminer-six
pytest-django
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/sourcehut/todo.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
, alembic
, pystache
, pytest
, factory_boy
, factory-boy
, python
, unzip
}:
Expand Down Expand Up @@ -54,7 +54,7 @@ buildPythonPackage rec {
# pytest tests fail
nativeCheckInputs = [
pytest
factory_boy
factory-boy
];

dontUseSetuptoolsCheck = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/argilla/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
, pytest-cov
, pytest-mock
, pytest-asyncio
, factory_boy
, factory-boy
}:
let
pname = "argilla";
Expand Down Expand Up @@ -166,7 +166,7 @@ buildPythonPackage {
pytest-cov
pytest-mock
pytest-asyncio
factory_boy
factory-boy
]
++ optional-dependencies.server
++ optional-dependencies.postgresql
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django-extensions/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, fetchFromGitHub
, fetchpatch
, django
, factory_boy
, factory-boy
, mock
, pip
, pygments
Expand Down Expand Up @@ -45,7 +45,7 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;

nativeCheckInputs = [
factory_boy
factory-boy
mock
pip
pygments # not explicitly declared in setup.py, but some tests require it
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django-silk/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, autopep8
, buildPythonPackage
, django
, factory_boy
, factory-boy
, fetchFromGitHub
, fetchpatch
, freezegun
Expand Down Expand Up @@ -73,7 +73,7 @@ buildPythonPackage rec {
freezegun
networkx
pydot
factory_boy
factory-boy
];

pythonImportsCheck = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/eth-keys/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, eth-hash
, eth-typing
, eth-utils
, factory_boy
, factory-boy
, hypothesis
, isPyPy
, pyasn1
Expand All @@ -33,7 +33,7 @@ buildPythonPackage rec {

nativeCheckInputs = [
asn1tools
factory_boy
factory-boy
hypothesis
pyasn1
pytestCheckHook
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/nasdaq-data-link/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, factory_boy
, factory-boy
, fetchFromGitHub
, httpretty
, inflection
Expand Down Expand Up @@ -42,7 +42,7 @@ buildPythonPackage rec {
];

nativeCheckInputs = [
factory_boy
factory-boy
httpretty
jsondate
mock
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pylint-django/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, django
, factory_boy
, factory-boy
, fetchFromGitHub
, pylint-plugin-utils
, pytestCheckHook
Expand All @@ -28,7 +28,7 @@ buildPythonPackage rec {
];

nativeCheckInputs = [
factory_boy
factory-boy
pytestCheckHook
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pytest-factoryboy/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# propagated
, inflection
, factory_boy
, factory-boy
, typing-extensions

# tests
Expand Down Expand Up @@ -38,7 +38,7 @@ buildPythonPackage rec {
];

propagatedBuildInputs = [
factory_boy
factory-boy
inflection
typing-extensions
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pytest-randomly/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, factory_boy
, factory-boy
, faker
, fetchFromGitHub
, importlib-metadata
Expand Down Expand Up @@ -34,7 +34,7 @@ buildPythonPackage rec {
];

nativeCheckInputs = [
factory_boy
factory-boy
faker
numpy
pytest-xdist
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/quandl/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, factory_boy
, factory-boy
, faker
, fetchPypi
, httpretty
Expand Down Expand Up @@ -49,7 +49,7 @@ buildPythonPackage rec {
];

nativeCheckInputs = [
factory_boy
factory-boy
faker
httpretty
jsondate
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/tld/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, factory_boy
, factory-boy
, faker
, fetchPypi
, pytestCheckHook
Expand Down Expand Up @@ -28,7 +28,7 @@ buildPythonPackage rec {
];

checkInputs = [
factory_boy
factory-boy
faker
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/toggl-cli/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, buildPythonPackage
, click
, click-completion
, factory_boy
, factory-boy
, faker
, fetchPypi
, inquirer
Expand Down Expand Up @@ -52,7 +52,7 @@ buildPythonPackage rec {
pytestCheckHook
pytest-mock
faker
factory_boy
factory-boy
];

postPatch = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/wagtail-factories/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ buildPythonPackage
, callPackage
, factory_boy
, factory-boy
, fetchFromGitHub
, lib
, wagtail
Expand All @@ -18,7 +18,7 @@ buildPythonPackage rec {
};

propagatedBuildInputs = [
factory_boy
factory-boy
wagtail
];

Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ mapAliases ({
Fabric = fabric; # addedd 2023-02-19
face_recognition = face-recognition; # added 2022-10-15
face_recognition_models = face-recognition-models; # added 2022-10-15
factory_boy = factory-boy; # added 2023-10-08
fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30
faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
inherit (super.pkgs) fetchPypi; # added 2023-05-25
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3716,7 +3716,7 @@ self: super: with self; {

face-recognition-models = callPackage ../development/python-modules/face-recognition/models.nix { };

factory_boy = callPackage ../development/python-modules/factory_boy { };
factory-boy = callPackage ../development/python-modules/factory-boy { };

fairscale = callPackage ../development/python-modules/fairscale { };

Expand Down

0 comments on commit 37773cd

Please sign in to comment.