Unverified Commit f8bfd48f authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #293466 from fabaff/google-cloud-storage-bump 

python311Packages.google-cloud-storage: 2.14.0 -> 2.15.0
parents 43d259f8 829e7868

pkgs/development/python-modules/django-storages/default.nix

+24 −24
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub



# build-system

, setuptools



# dependencies

, django



# optional-dependencies

, azure-storage-blob

, boto3

, buildPythonPackage

, cryptography

, django

, dropbox

, fetchFromGitHub

, google-cloud-storage

, libcloud

, paramiko



# tests

, cryptography

, moto

, paramiko

, pytestCheckHook

, pythonOlder

, rsa

, setuptools

}:



buildPythonPackage rec {

  pname = "django-storages";

  version = "1.14";

  format = "pyproject";

  version = "1.14.2";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "jschneier";

    repo = "django-storages";

    rev = "refs/tags/${version}";

    hash = "sha256-q+vQm1T5/ueGPfwzuUOmSI/nESchqJc4XizJieBsLWc=";

    hash = "sha256-V0uFZvnBi0B31b/j/u3Co6dd9XcdVefiSkl3XmCTJG4=";

  };



  nativeBuildInputs = [
@@ -67,12 +62,6 @@ buildPythonPackage rec { 
    ];

  };



  pythonImportsCheck = [

    "storages"

  ];



  env.DJANGO_SETTINGS_MODULE = "tests.settings";



  nativeCheckInputs = [

    cryptography

    moto
@@ -80,9 +69,20 @@ buildPythonPackage rec { 
    rsa

  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);



  pythonImportsCheck = [

    "storages"

  ];



  env.DJANGO_SETTINGS_MODULE = "tests.settings";



  disabledTests = [

    # AttributeError: 'str' object has no attribute 'universe_domain'

    "test_storage_save_gzip"

  ];



  meta = with lib; {

    changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst";

    description = "Collection of custom storage backends for Django";

    changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst";

    downloadPage = "https://github.com/jschneier/django-storages/";

    homepage = "https://django-storages.readthedocs.io";

    license = licenses.bsd3;

pkgs/development/python-modules/google-cloud-storage/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 


buildPythonPackage rec {

  pname = "google-cloud-storage";

  version = "2.14.0";

  version = "2.15.0";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-LSP89ZtV57RTNnKcFIuxxGRGjGnV77ruMPcgHdkOuX4=";

    hash = "sha256-dWCjxIoD1mxVPcVSFdNYg8aA/gq0TCOqSDKADMyFXHQ=";

  };



  nativeBuildInputs = [
@@ -72,6 +72,7 @@ buildPythonPackage rec { 
    "test_open"

    "test_anonymous_client_access_to_public_bucket"

    "test_ctor_w_custom_endpoint_use_auth"

    "test_ctor_w_api_endpoint_override"

  ];



  disabledTestPaths = [

pkgs/development/python-modules/oauthenticator/default.nix

+18 −2
Original line number Diff line number Diff line
@@ -10,12 +10,13 @@ 
, pytest-asyncio

, pytestCheckHook

, requests-mock

, setuptools

}:



buildPythonPackage rec {

  pname = "oauthenticator";

  version = "16.2.1";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.7";
@@ -26,9 +27,13 @@ buildPythonPackage rec { 


  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace " --cov=oauthenticator" ""

      --replace-fail " --cov=oauthenticator" ""

  '';



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    jupyterhub

  ];
@@ -56,6 +61,16 @@ buildPythonPackage rec { 
    # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432

    "test_azuread"

    "test_mediawiki"

    # Tests require network access

    "test_allowed"

    "test_auth0"

    "test_bitbucket"

    "test_cilogon"

    "test_github"

    "test_gitlab"

    "test_globus"

    "test_google"

    "test_openshift"

  ];



  pythonImportsCheck = [
@@ -67,5 +82,6 @@ buildPythonPackage rec { 
    homepage =  "https://github.com/jupyterhub/oauthenticator";

    changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md";

    license = licenses.bsd3;

    maintainers = with maintainers; [ ];

  };

}