Unverified Commit 9226999d authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #227329 from mweinelt/python-deps

Various python updates and fixes
parents a82c8611 5ae746ff
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
{ lib
, fetchFromGitHub
, pythonAtLeast
, pythonOlder
, buildPythonPackage

@@ -66,6 +67,11 @@ buildPythonPackage {
    pytestCheckHook
  ];

  pytestFlagsArray = lib.optionals (pythonAtLeast "3.11") [
    # DeprecationWarning: 'cgi' is deprecated and slated for removal in Python 3.13
    "-W" "ignore::DeprecationWarning"
  ];

  disabledTests = [
    # ModuleNotFoundError: No module named 'test_cache_options'
    "test_custom_key_function"
+42 −0
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, requests
}:

buildPythonPackage rec {
  pname = "opencontainers";
  version = "0.0.14";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-/eO4CZtWtclWQV34kz4iJ+GRToBaJ3uETy+eUjQXOPI=";
  };

  postPatch = ''
    sed -i "/pytest-runner/d" setup.py
  '';

  passthru.optional-dependencies.reggie = [
    requests
  ];

  pythonImportsCheck = [
    "opencontainers"
  ];

  nativeCheckInputs = [
    pytestCheckHook
  ] ++ passthru.optional-dependencies.reggie;

  __darwinAllowLocalNetworking = true;

  meta = with lib; {
    description = "Python module for oci specifications";
    homepage = "https://github.com/vsoch/oci-python";
    license = licenses.mpl20;
    maintainers = with maintainers; [ hexa ];
  };
}
+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@

buildPythonPackage rec {
  pname = "sentry-sdk";
  version = "1.18.0";
  version = "1.20.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
    owner = "getsentry";
    repo = "sentry-python";
    rev = "refs/tags/${version}";
    hash = "sha256-4HOJ6ouUU6RqtxYOsnoojT4aQ/h8YzcLHTO8lFZecZw=";
    hash = "sha256-fAlEh3S95Dyw1xHK2XaqbA6xUsASXbhzELGZTH/G+kg=";
  };

  propagatedBuildInputs = [
+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
, fetchFromGitHub
, buildPythonPackage
, lxml
, pythonAtLeast
, pythonOlder
, pytestCheckHook
}:
@@ -26,6 +27,12 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

  pytestFlagsArray = lib.optionals (pythonAtLeast "3.11") [
    # AttributeError: 'tuple' object has no attribute 'shortDescription'
    "--deselect=tests/testsuite.py::XMLTestRunnerTestCase::test_basic_unittest_constructs"
    "--deselect=tests/testsuite.py::XMLTestRunnerTestCase::test_unexpected_success"
  ];

  pythonImportsCheck = [ "xmlrunner" ];

  meta = with lib; {
+2 −0
Original line number Diff line number Diff line
@@ -6853,6 +6853,8 @@ self: super: with self; {

  opencensus-context = callPackage ../development/python-modules/opencensus-context { };

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

  opencv3 = toPythonModule (pkgs.opencv3.override {
    enablePython = true;
    pythonPackages = self;