From 9209e1ff2e23f0fd5d4b916fb8c465d6062bfae1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Jul 2023 19:21:32 +0200 Subject: [PATCH 1/6] python3Packages.para: init at 0.0.8 --- .../python-modules/para/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/para/default.nix diff --git a/pkgs/development/python-modules/para/default.nix b/pkgs/development/python-modules/para/default.nix new file mode 100644 index 000000000000..af46ab30fd23 --- /dev/null +++ b/pkgs/development/python-modules/para/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, nose +}: + +buildPythonPackage rec { + pname = "para"; + version = "0.0.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-RsMjKunY6p2IbP0IzdESiSICvthkX0C2JVWXukz+8hc="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + checkInputs = [ nose ]; + + pythonImportsCheck = [ "para" ]; + + meta = with lib; { + description = "A set utilities that ake advantage of python's 'multiprocessing' module to distribute CPU-intensive tasks"; + homepage = "https://pypi.org/project/para"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e12b14ef588d..16b7d564d05b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7527,6 +7527,8 @@ self: super: with self; { papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; + para = callPackage ../development/python-modules/para { }; + param = callPackage ../development/python-modules/param { }; parameter-expansion-patched = callPackage ../development/python-modules/parameter-expansion-patched { }; From c461142d7424416db32a402fee3523759938ee4d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Jul 2023 19:24:20 +0200 Subject: [PATCH 2/6] python3Packages.mwcli: init at 0.0.3 --- .../python-modules/mwcli/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/mwcli/default.nix diff --git a/pkgs/development/python-modules/mwcli/default.nix b/pkgs/development/python-modules/mwcli/default.nix new file mode 100644 index 000000000000..cc58e46d20c1 --- /dev/null +++ b/pkgs/development/python-modules/mwcli/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonRelaxDepsHook +, docopt +, para +}: + +buildPythonPackage rec { + pname = "mwcli"; + version = "0.0.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ADMb0P8WtXIcnGJ02R4l/TVfRewHc8ig45JurAWHGaA="; + }; + + # Prevent circular dependency + pythonRemoveDeps = [ + "mwxml" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + docopt + para + ]; + + # Tests require mwxml which itself depends on this package (circular dependency) + doCheck = false; + + meta = with lib; { + description = "A set of helper functions and classes for mediawiki-utilities command-line utilities"; + homepage = "https://github.com/mediawiki-utilities/python-mwcli"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16b7d564d05b..849457d106fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6714,6 +6714,8 @@ self: super: with self; { mujson = callPackage ../development/python-modules/mujson { }; + mwcli = callPackage ../development/python-modules/mwcli { }; + mwclient = callPackage ../development/python-modules/mwclient { }; mwdblib = callPackage ../development/python-modules/mwdblib { }; From a8100463271fce2f68f46530ab8d4970b1c6627c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Jul 2023 19:33:49 +0200 Subject: [PATCH 3/6] python3Packages.jsonable: init at 0.3.1 --- .../python-modules/jsonable/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/jsonable/default.nix diff --git a/pkgs/development/python-modules/jsonable/default.nix b/pkgs/development/python-modules/jsonable/default.nix new file mode 100644 index 000000000000..eabd310cb763 --- /dev/null +++ b/pkgs/development/python-modules/jsonable/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, nose +}: + +buildPythonPackage rec { + pname = "jsonable"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "halfak"; + repo = "python-jsonable"; + rev = "refs/tags/${version}"; + hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + checkInputs = [ nose ]; + + pythonImportsCheck = [ "jsonable" ]; + + meta = with lib; { + description = "Provides an abstract base class and utilities for defining trivially JSONable python objects"; + homepage = "https://github.com/halfak/python-jsonable"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 849457d106fa..d67a82850537 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5373,6 +5373,8 @@ self: super: with self; { json-stream-rs-tokenizer = callPackage ../development/python-modules/json-stream-rs-tokenizer { }; + jsonable = callPackage ../development/python-modules/jsonable { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; jsonpatch = callPackage ../development/python-modules/jsonpatch { }; From 3bdf99746b9d7289904cf9e7198ad6b930ca1430 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Jul 2023 19:43:54 +0200 Subject: [PATCH 4/6] python3Packages.mwtypes: init at 0.3.2 --- .../python-modules/mwtypes/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/mwtypes/default.nix diff --git a/pkgs/development/python-modules/mwtypes/default.nix b/pkgs/development/python-modules/mwtypes/default.nix new file mode 100644 index 000000000000..13e617599129 --- /dev/null +++ b/pkgs/development/python-modules/mwtypes/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonable +, pytestCheckHook +, nose +}: + +buildPythonPackage rec { + pname = "mwtypes"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3BF2xZZWKcEj6FmzGa5hUdTjhVMemngWBMDUyjQ045k="; + }; + + propagatedBuildInputs = [ jsonable ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + checkInputs = [ nose ]; + + disabledTests = [ + "test_normalize_path_bad_extension" + "test_open_file" + ]; + + pythonImportsCheck = [ "mwtypes" ]; + + meta = with lib; { + description = "A set of classes for working with MediaWiki data types."; + homepage = "https://github.com/mediawiki-utilities/python-mwtypes"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d67a82850537..14d263f1713e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6726,6 +6726,8 @@ self: super: with self; { mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; + mwtypes = callPackage ../development/python-modules/mwtypes { }; + mxnet = callPackage ../development/python-modules/mxnet { }; myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; From 7a99f315db566e1fe60cdd068d2a7776c1716563 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Jul 2023 19:55:34 +0200 Subject: [PATCH 5/6] python3Packages.mwxml: init at 0.3.3 --- .../python-modules/mwxml/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/mwxml/default.nix diff --git a/pkgs/development/python-modules/mwxml/default.nix b/pkgs/development/python-modules/mwxml/default.nix new file mode 100644 index 000000000000..5c66e2269163 --- /dev/null +++ b/pkgs/development/python-modules/mwxml/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonschema +, mwcli +, mwtypes +, pytestCheckHook +, nose +}: + +buildPythonPackage rec { + pname = "mwxml"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-CEjfDPLik3GPVUMRrPRxW9Z59jn05Sy+R9ggZYnbHTE="; + }; + + propagatedBuildInputs = [ + jsonschema + mwcli + mwtypes + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + checkInputs = [ nose ]; + + disabledTests = [ + "test_page_with_discussion" + ]; + + pythonImportsCheck = [ "mwxml" ]; + + meta = with lib; { + description = "A set of utilities for processing MediaWiki XML dump data"; + homepage = "https://github.com/mediawiki-utilities/python-mwxml"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 14d263f1713e..71df5f2c1d96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6728,6 +6728,8 @@ self: super: with self; { mwtypes = callPackage ../development/python-modules/mwtypes { }; + mwxml = callPackage ../development/python-modules/mwxml { }; + mxnet = callPackage ../development/python-modules/mxnet { }; myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; From 83f61a06525a72153b22003ae3f8b58a1bc9e7aa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Jul 2023 20:17:30 +0200 Subject: [PATCH 6/6] python3Packages.tensorflow-datasets: 4.8.2 -> 4.9.2 --- .../python-modules/tensorflow-datasets/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 962a39ababd4..1d60c09c6a82 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -1,4 +1,5 @@ { apache-beam +, array-record , attrs , beautifulsoup4 , buildPythonPackage @@ -19,6 +20,7 @@ , lxml , matplotlib , mwparserfromhell +, mwxml , networkx , nltk , numpy @@ -46,13 +48,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.8.2"; + version = "4.9.2"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - hash = "sha256-FYFk53WKNQTSrnGGiA6cn9LffbMJkZtjlGuOF52Og7c="; + hash = "sha256-FKquhuk5hVBH9Im2RrIwgmosgqkoJHj0ESR2BmAOlbI="; }; patches = [ @@ -61,6 +63,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + array-record attrs dill dm-tree @@ -95,6 +98,7 @@ buildPythonPackage rec { lxml matplotlib mwparserfromhell + mwxml networkx nltk opencv4 @@ -120,6 +124,7 @@ buildPythonPackage rec { "tensorflow_datasets/core/registered_test.py" "tensorflow_datasets/core/utils/gcs_utils_test.py" "tensorflow_datasets/import_without_tf_test.py" + "tensorflow_datasets/proto/build_tf_proto_test.py" "tensorflow_datasets/scripts/cli/build_test.py" # Requires `pretty_midi` which is not packaged in `nixpkgs`.