Commit e8888279 authored by Jan Tojnar's avatar Jan Tojnar Committed by github-actions[bot]
Browse files

cloudsmith-cli: Fix compatibility with urllib3 2.0 

This requires a patch but we cannot really apply those to a wheel,
so I had to switch to fetching the source from GitHub.
As a side benefit, we can now run tests.

(cherry picked from commit bd366372edc1e9985689ef70fe18b6d5e9b02bae)
parent 4f6d278e

pkgs/development/tools/cloudsmith-cli/default.nix

+51 −8
Original line number Diff line number Diff line 
{ lib

, python3

, fetchPypi

, fetchFromGitHub

, fetchpatch

}:



python3.pkgs.buildPythonApplication rec {

  pname = "cloudsmith-cli";

  version = "1.2.3";

  format = "wheel";

  format = "setuptools";



  src = fetchPypi {

    pname = "cloudsmith_cli";

    inherit format version;

    hash = "sha256-MIoRLWk6G8uchQlGOYOsg3XliZ1wMrYSOhAEQrus+fQ=";

  src = fetchFromGitHub {

    owner = "cloudsmith-io";

    repo = "cloudsmith-cli";

    rev = "v${version}";

    hash = "sha256-a4hLx+INdFq6Ux3XkI5GWgAiGLHCoDA+MP2FNY3E6WA=";

  };



  patches = [

    # Fix compatibility with urllib3 2.0

    (fetchpatch {

      url = "https://github.com/cloudsmith-io/cloudsmith-cli/commit/1a8d2d91c01320537b26778003735d6b694141c2.patch";

      revert = true;

      includes = [

        "cloudsmith_cli/core/rest.py"

      ];

      hash = "sha256-Rf3MMJuLr8fzkRqSftIJ1eUbgNdfrng2V609jYvpogc=";

    })

  ];



  nativeBuildInputs = with python3.pkgs; [

    pip

  ];



  propagatedBuildInputs = with python3.pkgs; [

    click

    click-configfile
@@ -30,13 +48,38 @@ python3.pkgs.buildPythonApplication rec { 
    setuptools # needs pkg_resources

  ];



  # Wheels have no tests

  doCheck = false;

  nativeCheckInputs = with python3.pkgs; [

    pytestCheckHook

    pytest-cov

  ];



  checkInputs = with python3.pkgs; [

    httpretty

  ];



  pythonImportsCheck = [

    "cloudsmith_cli"

  ];



  postPatch = ''

    # Permit urllib3 2.0

    substituteInPlace setup.py \

      --replace-fail 'urllib3<2.0' 'urllib3'

  '';



  preCheck = ''

    # E   _pytest.pathlib.ImportPathMismatchError: ('cloudsmith_cli.cli.tests.conftest', '/build/source/build/lib/cloudsmith_cli/cli/tests/conftest.py', PosixPath('/build/source/cloudsmith_cli/cli/tests/conftest.py'))

    # ___________ ERROR collecting cloudsmith_cli/core/tests/test_init.py ____________

    # import file mismatch:

    # imported module 'cloudsmith_cli.core.tests.test_init' has this __file__ attribute:

    #   /build/source/build/lib/cloudsmith_cli/core/tests/test_init.py

    # which is not the same as the test file we want to collect:

    #   /build/source/cloudsmith_cli/core/tests/test_init.py

    # HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file modules

    # https://github.com/NixOS/nixpkgs/issues/255262

    cd "$out"

  '';



  meta = with lib; {

    homepage = "https://help.cloudsmith.io/docs/cli/";

    description = "Cloudsmith Command Line Interface";