Merge branch 'main' into improvement-move-cache-fs-calls-to-repo-plugin

vanridal · web-flow · commit a8ff4bc4cef9 · 2025-07-08T09:33:02.000+10:00
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -30,7 +30,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -61,6 +61,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif
diff --git a/docs/source/configuring_rez.rst b/docs/source/configuring_rez.rst
@@ -11,7 +11,7 @@ Settings are determined in the following way:
 - The setting is then overridden if it is present in another settings file pointed at by the
   :envvar:`REZ_CONFIG_FILE` environment variable. This can also be a path-like variable, to read from
   multiple configuration files;
-- The setting is further overriden if it is present in ``$HOME/.rezconfig``;
+- The setting is further overriden if it is present in ``$HOME/.rezconfig`` or ``$HOME/.rezconfig.py``;
 - The setting is overridden again if the environment variable :envvar:`REZ_XXX` is present, where ``XXX`` is
   the uppercase version of the setting key. For example, :data:`.image_viewer` will be overriden by
   :envvar:`REZ_IMAGE_VIEWER`.
@@ -29,7 +29,7 @@ variable :envvar:`REZ_CONFIG_FILE` is then set to for all your users.
 Supported Configuration File Formats
 ====================================
 
-Rez supports both YAML configuration files and Python configuration files.
+Rez supports both YAML configuration files (``.rezconfig``) and Python configuration files (``.rezconfig.py``).
 
 You may prefer a Python based configuration file if you need to vary your configuration settings based on your
 current platform.
diff --git a/src/rez/bind/_utils.py b/src/rez/bind/_utils.py
@@ -26,8 +26,7 @@ def log(msg):
 
 def make_dirs(*dirs):
     path = os.path.join(*dirs)
-    if not os.path.exists(path):
-        os.makedirs(path)
+    os.makedirs(path, exist_ok=True)
     return path
 
 
diff --git a/src/rez/package_cache.py b/src/rez/package_cache.py
@@ -23,8 +23,7 @@
 from rez.exceptions import PackageCacheError
 from rez.vendor.lockfile import LockFile, NotLocked
 from rez.vendor.progress.spinner import PixelSpinner
-from rez.utils.filesystem import safe_listdir, safe_makedirs, safe_remove, \
-    forceful_rmtree
+from rez.utils.filesystem import forceful_rmtree, safe_listdir, safe_remove
 from rez.utils.colorize import ColorizedStreamHandler
 from rez.utils.logging_ import print_warning
 from rez.packages import get_variant
@@ -99,9 +98,9 @@ def __init__(self, path):
         self.path = path
 
         # make dirs for internal use
-        safe_makedirs(self._log_dir)
-        safe_makedirs(self._pending_dir)
-        safe_makedirs(self._remove_dir)
+        os.makedirs(self._log_dir, exist_ok=True)
+        os.makedirs(self._pending_dir, exist_ok=True)
+        os.makedirs(self._remove_dir, exist_ok=True)
 
     def get_cached_root(self, variant):
         """Get location of variant payload copy.
@@ -171,7 +170,6 @@ def add_variant(self, variant, force=False, wait_for_copying=False, logger=None)
             - int: One of VARIANT_FOUND, VARIANT_CREATED, VARIANT_COPYING, VARIANT_COPY_STALLED
         """
         from rez.utils.base26 import get_next_base26
-        from rez.utils.filesystem import safe_makedirs
 
         # do some sanity checking on variant to cache
         package = variant.parent
@@ -262,7 +260,7 @@ def add_variant(self, variant, force=False, wait_for_copying=False, logger=None)
 
         # 1.
         path = self._get_hash_path(variant)
-        safe_makedirs(path)
+        os.makedirs(path, exist_ok=True)
 
         # construct data to store to json file
         data = {
diff --git a/src/rez/package_copy.py b/src/rez/package_copy.py
@@ -17,7 +17,7 @@
 from rez.utils.sourcecode import IncludeModuleManager
 from rez.utils.logging_ import print_info, print_warning
 from rez.utils.filesystem import replacing_symlink, replacing_copy, \
-    safe_makedirs, additive_copytree, make_path_writable, get_existing_path
+    additive_copytree, make_path_writable, get_existing_path
 
 
 def copy_package(package, dest_repository, variants=None, shallow=False,
@@ -287,7 +287,7 @@ def _copy_variant_payload(src_variant, dest_pkg_repo, shallow=False,
 
     # copy the variant payload
     with ctxt:
-        safe_makedirs(variant_install_path)
+        os.makedirs(variant_install_path, exist_ok=True)
 
         # determine files not to copy
         skip_files = []
@@ -362,7 +362,7 @@ def _copy_variant_payload(src_variant, dest_pkg_repo, shallow=False,
                 src_package.config.variant_shortlinks_dirname
             )
 
-            safe_makedirs(base_shortlinks_path)
+            os.makedirs(base_shortlinks_path, exist_ok=True)
 
             # shortlink
             rel_variant_path = os.path.relpath(
@@ -425,5 +425,5 @@ def _copy_package_include_modules(src_package, dest_pkg_repo, overrides=None):
         ctxt = with_noop()
 
     with ctxt:
-        safe_makedirs(dest_include_modules_path)
+        os.makedirs(dest_include_modules_path, exist_ok=True)
         additive_copytree(src_include_modules_path, dest_include_modules_path)
diff --git a/src/rez/package_maker.py b/src/rez/package_maker.py
@@ -220,15 +220,13 @@ def make_package(name, path, make_base=None, make_root=None, skip_existing=True,
 
             base = variant_.base
             if make_base and base:
-                if not os.path.exists(base):
-                    os.makedirs(base)
+                os.makedirs(base, exist_ok=True)
                 os.chdir(base)
                 make_base(variant_, base)
 
             root = variant_.root
             if make_root and root:
-                if not os.path.exists(root):
-                    os.makedirs(root)
+                os.makedirs(root, exist_ok=True)
                 os.chdir(root)
                 make_root(variant_, root)
 
diff --git a/src/rez/package_test.py b/src/rez/package_test.py
@@ -213,6 +213,12 @@ def find_requested_test_names(self, requested_tests):
         run_on = ["default"] if not requested_tests else None
         pkg_test_names = self.get_test_names(run_on=run_on)
         requested_test_names = set()
+
+        if not requested_tests:
+            # if no tests are explicitly specified, then return all tests
+            # found in the package
+            return pkg_test_names
+
         for requested_test in requested_tests:
             requested_test_names.update(set(fnmatch.filter(pkg_test_names, requested_test)))
         return requested_test_names
diff --git a/src/rez/pip.py b/src/rez/pip.py
@@ -386,8 +386,7 @@ def make_root(variant, path):
                 src = os.path.join(targetpath, rel_src)
                 dest = os.path.join(path, rel_dest)
 
-                if not os.path.exists(os.path.dirname(dest)):
-                    os.makedirs(os.path.dirname(dest))
+                os.makedirs(os.path.dirname(dest), exist_ok=True)
 
                 shutil.copyfile(src, dest)
 
diff --git a/src/rez/resolved_context.py b/src/rez/resolved_context.py
@@ -1697,7 +1697,7 @@ def _print_version(value):
 
         data = d.get("package_orderers")
         if data:
-            r.package_orderers = [package_order.from_pod(x) for x in data]
+            r.package_orderers = PackageOrderList([package_order.from_pod(x) for x in data])
         else:
             r.package_orderers = None
 
diff --git a/src/rez/suite.py b/src/rez/suite.py
@@ -441,7 +441,7 @@ def save(self, path, verbose=False):
                 raise SuiteError("Cannot save, path exists: %r" % path)
 
         contexts_path = os.path.join(path, "contexts")
-        os.makedirs(contexts_path)
+        os.makedirs(contexts_path, exist_ok=True)
 
         # write suite data
         data = self.to_dict()
@@ -460,7 +460,7 @@ def save(self, path, verbose=False):
 
         # create alias wrappers
         tools_path = os.path.join(path, "bin")
-        os.makedirs(tools_path)
+        os.makedirs(tools_path, exist_ok=True)
         if verbose:
             print("creating alias wrappers in %r..." % tools_path)
 
diff --git a/src/rez/tests/test_context.py b/src/rez/tests/test_context.py
@@ -278,6 +278,35 @@ def test_orderer_package_argument(self):
         resolved = [x.qualified_package_name for x in r.resolved_packages]
         self.assertEqual(resolved, ['python-2.7.0'])
 
+    def test_serialize_roundtrip_with_extra_settings(self):
+        from rez.package_order import VersionSplitPackageOrder
+        from rez.version import Version
+
+        packages_path = self.data_path("solver", "packages")
+
+        file = os.path.join(self.root, "roundtrip.rxt")
+        orderers = [VersionSplitPackageOrder(Version("2.6.8"))]
+        r1 = ResolvedContext(
+            ["python"],
+            package_orderers=orderers,
+            package_paths=[packages_path],
+        )
+        r1.save(file)
+        r2 = ResolvedContext.load(file)
+
+        self.assertEqual(r1, r2)
+
+        ignored_properties = [
+            'load_path',
+            'graph_string',
+            'graph_'
+        ]
+        for k, v in r1.__dict__.items():
+            if k in ignored_properties:
+                continue
+            # check types here, as not all type instances are comparable
+            self.assertIs(type(v), type(r2.__dict__.get(k)))
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/src/rez/tests/test_package_repository.py b/src/rez/tests/test_package_repository.py
@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright Contributors to the Rez Project
+
+
+"""
+Test package repository plugin.
+"""
+import unittest
+
+from rezplugins.package_repository import filesystem
+from rez.packages import create_package
+from rez.tests.util import TestBase, TempdirMixin
+from rez.utils.platform_ import platform_
+
+
+class TestFilesystemPackageRepository(TestBase, TempdirMixin):
+    @classmethod
+    def setUpClass(cls):
+        TempdirMixin.setUpClass()
+
+        cls.settings = dict()
+
+    @classmethod
+    def tearDownClass(cls):
+        TempdirMixin.tearDownClass()
+
+    @unittest.skipIf(platform_.name != "windows",
+                     "Skipping because this issue only affects case-insensitive platforms.")
+    def test_mismatching_case(self):
+        """Test that we get a caught PackageRepositoryError on case-insensitive platforms."""
+        pool = filesystem.ResourcePool(cache_size=None)
+        pkg_repository = filesystem.FileSystemPackageRepository(self.root, pool)
+
+        package = create_package("myTestPackage", data={})
+        variant = next(package.iter_variants())
+        case_mismatch_package = create_package("MyTestPackage", data={})
+        case_mismatch_variant = next(case_mismatch_package.iter_variants())
+
+        pkg_repository._create_variant(variant, overrides={})
+        with self.assertRaises(filesystem.PackageRepositoryError):
+            pkg_repository._create_variant(case_mismatch_variant, overrides={})
diff --git a/src/rez/tests/test_packages.py b/src/rez/tests/test_packages.py
@@ -347,8 +347,7 @@ def test_variant_iteration(self):
     def test_variant_install(self):
         """test variant installation."""
         repo_path = os.path.join(self.root, "packages")
-        if not os.path.exists(repo_path):
-            os.makedirs(repo_path)
+        os.makedirs(repo_path, exist_ok=True)
 
         def _data(obj):
             d = obj.validated_data()
diff --git a/src/rez/tests/test_test.py b/src/rez/tests/test_test.py
@@ -264,3 +264,46 @@ def test_wildcard_05(self):
             "failed",
             "move_meeting_to_noon did not fail",
         )
+
+    def test_empty_test_list(self):
+        """
+        package.py unit tests are correctly found when no test name is provided (empty list)
+        """
+        self.inject_python_repo()
+        context = ResolvedContext(["testing_obj", "python"])
+        # This will get us more code coverage :)
+        self.inject_python_repo()
+        runner = PackageTestRunner(
+            package_request="testing_obj",
+            package_paths=context.package_paths,
+
+        )
+
+        test_names = runner.find_requested_test_names([])
+        self.assertEqual(4, len(test_names))
+
+        for test_name in test_names:
+            runner.run_test(test_name)
+
+        self.assertEqual(runner.test_results.num_tests, 4)
+
+        self.assertEqual(
+            self._get_test_result(runner, "check_car_ideas")["status"],
+            "success",
+            "check_car_ideas did not succeed",
+        )
+        self.assertEqual(
+            self._get_test_result(runner, "move_meeting_to_noon")["status"],
+            "failed",
+            "move_meeting_to_noon did not fail",
+        )
+        self.assertEqual(
+            self._get_test_result(runner, "command_as_string_success")["status"],
+            "success",
+            "command_as_string_success did not succeed",
+        )
+        self.assertEqual(
+            self._get_test_result(runner, "command_as_string_fail")["status"],
+            "failed",
+            "command_as_string_fail did not fail",
+        )
diff --git a/src/rez/tests/test_util.py b/src/rez/tests/test_util.py
@@ -6,13 +6,22 @@
 unit tests for 'util' module
 """
 import os
-import tempfile
 import sys
-from rez.tests.util import TestBase
+from rez.tests.util import TestBase, TempdirMixin
 from rez.util import load_module_from_file
 
 
-class TestLoadModuleFromFile(TestBase):
+class TestLoadModuleFromFile(TestBase, TempdirMixin):
+    @classmethod
+    def setUpClass(cls):
+        TempdirMixin.setUpClass()
+
+        cls.settings = dict()
+
+    @classmethod
+    def tearDownClass(cls):
+        TempdirMixin.tearDownClass()
+
     def test_load_module(self):
         """Ensure that the imported module does not show up in sys.modules"""
         # Random chars are used in the module name to ensure that the module name is unique
@@ -21,10 +30,9 @@ def test_load_module(self):
         module = 'utils_test_7cd3a335'
 
         filename = '{0}.py'.format(module)
-        tmpdir = tempfile.mkdtemp(prefix="rez_selftest_")
 
-        with open(os.path.join(tmpdir, filename), 'w') as fd:
+        with open(os.path.join(self.root, filename), 'w') as fd:
             fd.write('')
 
-        load_module_from_file(module, os.path.join(tmpdir, filename))
+        load_module_from_file(module, os.path.join(self.root, filename))
         self.assertEqual(sys.modules.get(module), None, msg='Module was found in sys.modules')
diff --git a/src/rez/utils/filesystem.py b/src/rez/utils/filesystem.py
diff --git a/src/rez/utils/py_dist.py b/src/rez/utils/py_dist.py
diff --git a/src/rezplugins/build_process/local.py b/src/rezplugins/build_process/local.py
diff --git a/src/rezplugins/package_repository/filesystem.py b/src/rezplugins/package_repository/filesystem.py
