Skip to content

Commit

Permalink
Revert "add token"
Browse files Browse the repository at this point in the history
This reverts commit 189524d.
  • Loading branch information
danimtb committed May 21, 2024
1 parent 189524d commit 0c895c2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion extensions/commands/art/cmd_build_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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('.'),
Expand Down
6 changes: 2 additions & 4 deletions tests/test_artifactory_commands.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit 0c895c2

Please sign in to comment.