From 0c895c23435430e7df8614f90c204e3f3c9c6504 Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 21 May 2024 17:04:39 +0200 Subject: [PATCH] Revert "add token" This reverts commit 189524d560b107a50b429f6dec9d047ca3bf65ef. --- extensions/commands/art/cmd_build_info.py | 2 +- tests/test_artifactory_commands.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/extensions/commands/art/cmd_build_info.py b/extensions/commands/art/cmd_build_info.py index f68fbd13..606f982d 100644 --- a/extensions/commands/art/cmd_build_info.py +++ b/extensions/commands/art/cmd_build_info.py @@ -146,7 +146,7 @@ def _get_local_artifacts(): file_list = list(dl_folder.glob("*")) if len(file_list) >= 3: for file_path in dl_folder.glob("*"): - if file_path.is_file(): + if file_path.is_file(): # FIXME: Make it recursive for metadata folder file_name = file_path.name md5, sha1, sha256 = _get_hashes(file_path) artifact_info = {"type": os.path.splitext(file_name)[1].lstrip('.'), diff --git a/tests/test_artifactory_commands.py b/tests/test_artifactory_commands.py index 65866f91..e9052271 100644 --- a/tests/test_artifactory_commands.py +++ b/tests/test_artifactory_commands.py @@ -1,13 +1,11 @@ +import json import os import tempfile +import textwrap -<<<<<<< HEAD from tools import run, save from conan.tools.scm import Version from conan import conan_version -======= -from tools import run ->>>>>>> parent of cce91f3 (fixing python_requires in buildInfo) import pytest