From 5ec85dc83ef8adeb620866701e9b58cc9fcbd76b Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 4 Jul 2023 13:57:56 +0100 Subject: [PATCH 1/5] python3Packages.manifestoo-core: init at 0.11.0 --- .../manifestoo-core/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/manifestoo-core/default.nix diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix new file mode 100644 index 000000000000..3135ded66ebf --- /dev/null +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -0,0 +1,40 @@ +{ buildPythonPackage +, typing-extensions +, fetchPypi +, lib +, nix-update-script +, hatch-vcs +, pythonOlder +, importlib-resources +}: + +buildPythonPackage rec { + pname = "manifestoo-core"; + version = "0.11.0"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "manifestoo_core"; + hash = "sha256-ZZAJDOtGcYWm0yS5bMOUdM1Jf+kfurwiLsJwyTYPz/4="; + }; + + nativeBuildInputs = [ + hatch-vcs + ]; + + propagatedBuildInputs = + lib.optionals (pythonOlder "3.7") [ importlib-resources ] + ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A library to reason about Odoo addons manifests"; + homepage = "https://github.com/acsone/manifestoo-core"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 114450f0818e..750759aeb764 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6097,6 +6097,8 @@ self: super: with self; { manifest-ml = callPackage ../development/python-modules/manifest-ml { }; + manifestoo-core = callPackage ../development/python-modules/manifestoo-core { }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; manuel = callPackage ../development/python-modules/manuel { }; From 8d6db778ff575a709bfdf3b650c02dca3dcf72df Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 4 Jul 2023 13:58:29 +0100 Subject: [PATCH 2/5] python3Packages.click-odoo: init at 1.6.0 --- .../python-modules/click-odoo/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/click-odoo/default.nix diff --git a/pkgs/development/python-modules/click-odoo/default.nix b/pkgs/development/python-modules/click-odoo/default.nix new file mode 100644 index 000000000000..a618359735f1 --- /dev/null +++ b/pkgs/development/python-modules/click-odoo/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, click +, fetchPypi +, lib +, nix-update-script +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "click-odoo"; + version = "1.6.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zyfgsHzIoz4lnqANe63b2oqgD/oxBbTbJYEedfSHWQ8="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Odoo scripting helper library"; + homepage = "https://github.com/acsone/click-odoo"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 750759aeb764..d37eb9409dcf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1929,6 +1929,8 @@ self: super: with self; { click-log = callPackage ../development/python-modules/click-log { }; + click-odoo = callPackage ../development/python-modules/click-odoo { }; + click-option-group = callPackage ../development/python-modules/click-option-group { }; click-plugins = callPackage ../development/python-modules/click-plugins { }; From dd4cb577d92212e76e5a29745fccef5fc01f7e03 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 4 Jul 2023 14:10:03 +0100 Subject: [PATCH 3/5] python3Packages.click-odoo-contrib: init at 1.16.1 --- .../click-odoo-contrib/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/click-odoo-contrib/default.nix diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix new file mode 100644 index 000000000000..b0ddaef004b9 --- /dev/null +++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, click-odoo +, fetchPypi +, importlib-resources +, lib +, manifestoo-core +, nix-update-script +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "click-odoo-contrib"; + version = "1.16.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VFoS/lOw/jbJNj9xfgZHKzR6JDTwnlCAItq4mZ3RA6I="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click-odoo + manifestoo-core + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + pythonImportsCheck = [ "click_odoo_contrib" ]; + + meta = with lib; { + description = "Collection of community-maintained scripts for Odoo maintenance"; + homepage = "https://github.com/acsone/click-odoo-contrib"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d37eb9409dcf..fd5e6dbb7ad2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1931,6 +1931,8 @@ self: super: with self; { click-odoo = callPackage ../development/python-modules/click-odoo { }; + click-odoo-contrib = callPackage ../development/python-modules/click-odoo-contrib { }; + click-option-group = callPackage ../development/python-modules/click-option-group { }; click-plugins = callPackage ../development/python-modules/click-plugins { }; From cb0966b94f5e112f262fafd70ddbc833928ecd59 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 6 Jul 2023 11:56:24 +0100 Subject: [PATCH 4/5] python3Packages.manifestoo: init at 0.7 --- .../python-modules/manifestoo/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/manifestoo/default.nix diff --git a/pkgs/development/python-modules/manifestoo/default.nix b/pkgs/development/python-modules/manifestoo/default.nix new file mode 100644 index 000000000000..c9499eb11310 --- /dev/null +++ b/pkgs/development/python-modules/manifestoo/default.nix @@ -0,0 +1,51 @@ +{ buildPythonPackage +, fetchPypi +, hatch-vcs +, importlib-metadata +, lib +, manifestoo-core +, nix-update-script +, pytestCheckHook +, pythonOlder +, textual +, typer +, typing-extensions +}: + +buildPythonPackage rec { + pname = "manifestoo"; + version = "0.7"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gCGchc+fShBgt6fVJAx80+QnH+vxWo3jsIyePkFwhYE="; + }; + + nativeBuildInputs = [ + hatch-vcs + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + propagatedBuildInputs = [ + manifestoo-core + textual + typer + ] + ++ typer.passthru.optional-dependencies.all + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A tool to reason about Odoo addons manifests"; + homepage = "https://github.com/acsone/manifestoo"; + license = licenses.mit; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd5e6dbb7ad2..69678348b806 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6101,6 +6101,8 @@ self: super: with self; { manifest-ml = callPackage ../development/python-modules/manifest-ml { }; + manifestoo = callPackage ../development/python-modules/manifestoo { }; + manifestoo-core = callPackage ../development/python-modules/manifestoo-core { }; manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; From 7ac8d2c63bed21f0cca9c564fc8bc05bcf54bbf2 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 6 Jul 2023 12:30:59 +0100 Subject: [PATCH 5/5] python3Packages.syrupy: fix wrong version disabler `pythonOlder` only checks for major and minor version specifiers of python. However, https://github.com/tophat/syrupy/releases/tag/v4.0.0 specifies that 3.8.1 is the minimum supported release. Currently, although deprecated, the provided python38 version is 3.8.17. Thus this package should be available. --- pkgs/development/python-modules/syrupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 4043cb637c2f..d571c9dd7655 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder +, python , poetry-core , pytest , colored @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "4.0.2"; format = "pyproject"; - disabled = pythonOlder "3.8.1"; + disabled = lib.versionOlder python.version "3.8.1"; src = fetchFromGitHub { owner = "tophat";