Unverified Commit 688b234f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

conan: 2.22.2 -> 2.26.1 (#495124)

parents e3c618f3 08823f7b
Loading
Loading
Loading
Loading
+12 −5
Original line number Diff line number Diff line
@@ -12,18 +12,19 @@

python3Packages.buildPythonApplication (finalAttrs: {
  pname = "conan";
  version = "2.22.2";
  version = "2.26.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "conan-io";
    repo = "conan";
    tag = finalAttrs.version;
    hash = "sha256-4OKrAfhHgtAS606P88JFYCjgYYlSAH8RReqFs6N2V5s=";
    hash = "sha256-PBrVt8SM3AFdi/w18c4ZExzNnfTANtAdTUHIquk1At0=";
  };

  pythonRelaxDeps = [
    "distro"
    "patch-ng"
    "urllib3"
  ];

@@ -82,6 +83,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
    "test_shared_windows_find_libraries"
    # 'cmake' tool version 'Any' is not available
    "test_build"
    "test_conan_new"
    "test_conan_new_compiles"
    # 'cmake' tool version '3.27' is not available
    "test_metabuild"
@@ -104,6 +106,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
    # Requires cmake, meson, autotools, apt-get, etc.
    "test/functional/command/runner_test.py"
    "test/functional/command/test_install_deploy.py"
    "test/functional/command/test_new.py"
    "test/functional/layout/test_editable_cmake.py"
    "test/functional/layout/test_editable_cmake_components.py"
    "test/functional/layout/test_in_subfolder.py"
@@ -113,12 +116,16 @@ python3Packages.buildPythonApplication (finalAttrs: {
    "test/functional/toolchains/"
    "test/functional/tools/scm/test_git.py"
    "test/functional/tools/system/package_manager_test.py"
    "test/functional/sbom/test_cyclonedx.py"
    "test/functional/workspace/test_workspace.py"
    "test/functional/tools_versions_test.py"
    "test/functional/util/test_cmd_args_to_string.py"
    "test/performance/test_large_graph.py"

    # Requires network access to PyPI
    "test/functional/tools/system/python_manager_test.py"

    # Test failure
    "test/unittests/tools/env/test_env_files.py"
    # pipenv will attempt to access the network.
    "test/functional/tools/system/pip_manager_test.py"
  ];

  meta = {