conan-server 2.2.0__tar.gz → 2.2.2__tar.gz

{conan-server-2.2.0/conan_server.egg-info → conan-server-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conan-server
-Version: 2.2.0
+Version: 2.2.2
 Summary: Conan Server of Conan C/C++ package manager
 Home-page: https://conan.io
 Author: JFrog LTD

{conan-server-2.2.0 → conan-server-2.2.2}/conan/tools/cmake/toolchain/blocks.py

@@ -154,7 +154,7 @@ class VSDebuggerEnvironment(Block):
 
         if not config_dict:
             return None
-        
+
         vs_debugger_path = ""
         for config, value in config_dict.items():
             vs_debugger_path += f"$<$<CONFIG:{config}>:{value}>"
@@ -613,7 +613,9 @@ class ExtraFlagsBlock(Block):
         {% endif %}
         {% if defines %}
         {% if config %}
-        add_compile_definitions($<$<CONFIG:{{config}}>:{% for define in defines %}" {{ define }}"{% endfor %}>)
+        {% for define in defines %}
+        add_compile_definitions($<$<CONFIG:{{config}}>:"{{ define }}">)
+        {% endfor %}
         {% else %}
         add_compile_definitions({% for define in defines %} "{{ define }}"{% endfor %})
         {% endif %}

{conan-server-2.2.0 → conan-server-2.2.2/conan_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conan-server
-Version: 2.2.0
+Version: 2.2.2
 Summary: Conan Server of Conan C/C++ package manager
 Home-page: https://conan.io
 Author: JFrog LTD

{conan-server-2.2.0 → conan-server-2.2.2}/conans/__init__.py

@@ -2,4 +2,4 @@ CHECKSUM_DEPLOY = "checksum_deploy"  # Only when v2
 REVISIONS = "revisions"  # Only when enabled in config, not by default look at server_launcher.py
 OAUTH_TOKEN = "oauth_token"
 
-__version__ = '2.2.0'
+__version__ = '2.2.2'

{conan-server-2.2.0 → conan-server-2.2.2}/conans/client/loader.py

@@ -323,7 +323,8 @@ def _load_python_file(conan_file_path):
         raise NotFoundException("%s not found!" % conan_file_path)
 
     def new_print(*args, **kwargs):  # Make sure that all user python files print() goes to stderr
-        print(*args, **kwargs, file=sys.stderr)
+        kwargs.setdefault("file", sys.stderr)
+        print(*args, **kwargs)
 
     module_id = str(uuid.uuid1())
     current_dir = os.path.dirname(conan_file_path)

{conan-server-2.2.0 → conan-server-2.2.2}/conans/client/rest_client_local_recipe_index.py

@@ -1,7 +1,6 @@
 import os
 import sys
 import textwrap
-from distutils.dir_util import copy_tree
 from fnmatch import fnmatch
 from io import StringIO
 
@@ -14,7 +13,7 @@ from conans.client.cmd.export import cmd_export
 from conans.errors import ConanException, PackageNotFoundException, RecipeNotFoundException
 from conans.model.conf import ConfDefinition
 from conans.model.recipe_ref import RecipeReference
-from conans.util.files import load, save, rmdir
+from conans.util.files import load, save, rmdir, copytree_compat
 
 
 def add_local_recipes_index_remote(conan_api, remote):
@@ -160,7 +159,7 @@ class RestApiClientLocalRecipesIndex:
     def _copy_files(source_folder, dest_folder):
         if not os.path.exists(source_folder):
             return {}
-        copy_tree(source_folder, dest_folder)
+        copytree_compat(source_folder, dest_folder)
         ret = {}
         for root, _, _files in os.walk(dest_folder):
             for _f in _files:

{conan-server-2.2.0 → conan-server-2.2.2}/conans/util/files.py

@@ -5,6 +5,7 @@ import os
 import platform
 import shutil
 import stat
+import sys
 import tarfile
 import time
 
@@ -373,3 +374,12 @@ def human_size(size_bytes):
         formatted_size = str(round(num, ndigits=the_precision))
 
     return "%s%s" % (formatted_size, the_suffix)
+
+
+# FIXME: completely remove disutils once we don't support <3.8 any more
+def copytree_compat(source_folder, dest_folder):
+    if sys.version_info >= (3, 8):
+        shutil.copytree(source_folder, dest_folder, dirs_exist_ok=True)
+    else:
+        from distutils.dir_util import copy_tree
+        copy_tree(source_folder, dest_folder)