Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

buildPythonPackage rec {
pname = "importlib-metadata";
version = "4.8.2";
version = "4.10.0";
format = "setuptools";

disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";

src = fetchPypi {
pname = "importlib_metadata";
inherit version;
sha256 = "sha256-db3sFMOX9ShyTBv9lwnWYLM6TS53OHozWPILhIu15fs=";
hash = "sha256-kqi1jOc0sqRJSHjg7PfXnM16EotfxgFMQB4LYfAG8PY=";
};

nativeBuildInputs = [
Expand Down
12 changes: 9 additions & 3 deletions pkgs/development/python-modules/pytenable/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
, pytestCheckHook
, python-box
, python-dateutil
, pythonOlder
, requests
, requests-pkcs12
, responses
Expand All @@ -19,13 +20,16 @@

buildPythonPackage rec {
pname = "pytenable";
version = "1.4.2";
version = "1.4.3";
format = "setuptools";

disabled = pythonOlder "3.7";

src = fetchFromGitHub {
owner = "tenable";
repo = "pyTenable";
rev = version;
sha256 = "sha256-qljoJ+nYFVS5VHr/M4mITtO9Czuyb4HLzVjhprhyJIs=";
hash = "sha256-p9d3wZkOMhNQWJN6tCNUlW15A3irU8QN/nm7PLGTE/M=";
};

propagatedBuildInputs = [
Expand Down Expand Up @@ -59,7 +63,9 @@ buildPythonPackage rec {
"test_uploads_docker_push_cs_tag_typeerror"
];

pythonImportsCheck = [ "tenable" ];
pythonImportsCheck = [
"tenable"
];

meta = with lib; {
description = "Python library for the Tenable.io and TenableSC API";
Expand Down
10 changes: 8 additions & 2 deletions pkgs/development/python-modules/restfly/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,22 @@
, pytest-vcr
, pytestCheckHook
, python-box
, pythonOlder
, requests
}:

buildPythonPackage rec {
pname = "restfly";
version = "1.4.4";
format = "setuptools";

disabled = pythonOlder "3.7";

src = fetchFromGitHub {
owner = "stevemcgrath";
repo = pname;
rev = version;
sha256 = "sha256-T5NfG+Vuguh6xZ/Rdx3a1vMDgXPcl/OYhOkxb76yEXg=";
hash = "sha256-T5NfG+Vuguh6xZ/Rdx3a1vMDgXPcl/OYhOkxb76yEXg=";
};

propagatedBuildInputs = [
Expand All @@ -37,7 +41,9 @@ buildPythonPackage rec {
"test_session_ssl_error"
];

pythonImportsCheck = [ "restfly" ];
pythonImportsCheck = [
"restfly"
];

meta = with lib; {
description = "Python RESTfly API Library Framework";
Expand Down
46 changes: 30 additions & 16 deletions pkgs/development/python-modules/typing-extensions/default.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,41 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, python, typing }:
let
testDir = if isPy3k then "src_py3" else "src_py2";
{ lib
, buildPythonPackage
, fetchPypi
, flit-core
, python
, pythonOlder
}:

in buildPythonPackage rec {
pname = "typing_extensions";
version = "3.10.0.2";
buildPythonPackage rec {
pname = "typing-extensions";
version = "4.0.1";
format = "pyproject";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming this is the cause of

$ nix-env --option system x86_64-linux -f /home/jon/.cache/nixpkgs-review/pr-152660-1/nixpkgs -qaP --xml --out-path --show-trace --meta
error: stack overflow (possible infinite recursion)


disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
sha256 = "49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e";
pname = "typing_extensions";
inherit version;
hash = "sha256-TKCR3qFJ+UXsVq+0ja5xTyHoaS7yKjlSI7zTKJYbag4=";
};

checkInputs = lib.optional (pythonOlder "3.5") typing;

# Error for Python3.6: ImportError: cannot import name 'ann_module'
# See https://github.com/python/typing/pull/280
doCheck = pythonOlder "3.6";
nativeBuildInputs = [
flit-core
];

checkPhase = ''
cd ${testDir}
${python.interpreter} -m unittest discover
postPatch = ''
# Remove metadata for README which are outdated
sed -i -e '11,24d' pyproject.toml
'';

# Tests are not part of PyPI releases. GitHub source can't be used
# as it ends with an infinite recursion
doCheck = false;

pythonImportsCheck = [
"typing_extensions"
];

meta = with lib; {
description = "Backported and Experimental Type Hints for Python 3.5+";
homepage = "https://github.com/python/typing";
Expand Down