From 073eb59305dcbd3f12366bd0b324c9f48fa86183 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 22:06:18 +0200 Subject: [PATCH 1/2] python311Packages.gremlinpython: 3.6.1 -> 3.6.3 Diff: https://github.com/apache/tinkerpop/compare/3.6.1...3.6.3 --- pkgs/development/python-modules/gremlinpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index a16cbd3cca82..a75913c540ce 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gremlinpython"; - version = "3.6.1"; + version = "3.6.3"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; rev = version; - hash = "sha256-FMA9hJdq7gYkDtQO04Bwpjq2Q7nXGuN9wrBD4b9GgwY="; + hash = "sha256-CmVWaRebJaZHJGzhaBdYXPF3BZ8+Cvc5P/KOpsG+dX4="; }; sourceRoot = "source/gremlin-python/src/main/python"; From d76fb6f21f085407bb8598d84575cc037ff5a148 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 22:15:13 +0200 Subject: [PATCH 2/2] python311Packages.gremlinpython: disable on unsupported Python releases - add format --- pkgs/development/python-modules/gremlinpython/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index a75913c540ce..f4835aa47e4f 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -7,6 +7,7 @@ , isodate , nest-asyncio , pytestCheckHook +, pythonOlder , mock , pyhamcrest , radish-bdd @@ -15,12 +16,14 @@ buildPythonPackage rec { pname = "gremlinpython"; version = "3.6.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-CmVWaRebJaZHJGzhaBdYXPF3BZ8+Cvc5P/KOpsG+dX4="; }; @@ -30,7 +33,6 @@ buildPythonPackage rec { sed -i '/pytest-runner/d' setup.py substituteInPlace setup.py \ - --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \ --replace 'importlib-metadata<5.0.0' 'importlib-metadata' \ --replace "os.getenv('VERSION', '?').replace('-SNAPSHOT', '.dev-%d' % timestamp)" '"${version}"' '';