Unverified Commit 7e1be015 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #311742 from SFrijters/dropbox-12.0.0 

python3Packages.dropbox: 11.36.2 -> 12.0.0
parents 4582b524 5643058a

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

+23 −4
Original line number Diff line number Diff line
@@ -6,15 +6,18 @@ 
, requests

, six

, stone

, urllib3

, mock

, pytest-mock

, pytestCheckHook

, sphinxHook

, sphinx-rtd-theme

, pythonRelaxDepsHook

}:



buildPythonPackage rec {

  pname = "dropbox";

  version = "11.36.2";

  version = "12.0.0";

  pyproject = true;



  disabled = pythonOlder "3.7";
@@ -25,7 +28,7 @@ buildPythonPackage rec { 
    owner = "dropbox";

    repo = "dropbox-sdk-python";

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

    hash = "sha256-d++lxsbwPxnz1JPguWkImHXB+GQpMa9Uo3JNIxIe2ok=";

    hash = "sha256-0MDm6NB+0vkN8QRSHvuDYEyYhYQWQD4jsctyd5fLdwE=";

  };



  build-system = [
@@ -36,6 +39,7 @@ buildPythonPackage rec { 
    requests

    six

    stone

    urllib3

  ];



  nativeCheckInputs = [
@@ -55,7 +59,20 @@ buildPythonPackage rec { 
    "dropbox"

  ];



  nativeBuildInputs = [ sphinxHook ];

  nativeBuildInputs = [

    sphinxHook

    sphinx-rtd-theme

    pythonRelaxDepsHook

  ];



  # Version 12.0.0 re-introduced Python 2 support and set some very restrictive version bounds

  # https://github.com/dropbox/dropbox-sdk-python/commit/75596daf316b4a806f18057e2797a15bdf83cf6d

  # This will be the last major version to support Python 2, so version bounds might be more reasonable again in the future.

  pythonRelaxDeps = [

    "requests"

    "stone"

    "urllib3"

  ];



  # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.

  disabledTests = [
@@ -77,6 +94,8 @@ buildPythonPackage rec { 
    "test_as_user"

    "test_as_admin"

    "test_clone_when_team_linked"

    "test_bad_pins"

    "test_bad_pins_session"

  ];



  meta = with lib; {

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

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
, typing-extensions

, watchdog

, xattr

, fetchpatch

, pytestCheckHook

, nixosTests

}:
@@ -69,6 +70,14 @@ buildPythonPackage rec { 
    rubicon-objc

  ];



  patches = [

    (fetchpatch {

      name = "upgrade-dropbox-version-bounds";

      url = "https://github.com/samschott/maestral/commit/8fd581fa503391534913afbc33a61132ff2e21ce.patch";

      hash = "sha256-2Dke9iF/5Ptsf3CSRHUkjdFRrmdKY+L3sILRMyYrUH0=";

    })

  ];



  makeWrapperArgs = [

    # Add the installed directories to the python path so the daemon can find them

    "--prefix PYTHONPATH : ${makePythonPath dependencies}"