Skip to content

Commit c6a200c

Browse files
Rename rez.vendor.version to rez.version and define a public API for rez.version (#1534)
Signed-off-by: Jean-Christophe Morin <[email protected]>
1 parent eca3861 commit c6a200c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2673
-2501
lines changed

docs/source/api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ Python API
4343
rez.system
4444
rez.util
4545
rez.utils
46-
rez.vendor.version
46+
rez.version
4747
rez.wrapper

docs/source/conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
# TODO: Remove once we unvendor enum.
4949
("py:class", "rez.solver._Common"),
5050
("py:class", "_thread._local"),
51-
("py:class", "rez.utils.platform_._UnixPlatform")
51+
("py:class", "rez.utils.platform_._UnixPlatform"),
52+
("py:class", "rez.version._util._Common"),
53+
("py:class", "rez.version._version._Comparable"),
5254
]
5355

5456
nitpick_ignore_regex = [

docs/source/package_commands.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ Following is a list of the objects and functions available.
477477
if "foo.cli" in ephemerals:
478478
info("Foo cli option is being specified!")
479479
480-
.. py:function:: ephemerals.get_range(name: str, range_: str) -> ~rez.vendor.version.version.VersionRange
480+
.. py:function:: ephemerals.get_range(name: str, range_: str) -> ~rez.version.VersionRange
481481
482482
Use ``get_range`` to test with the :func:`intersects` function.
483483
Here, we enable ``foo``'s commandline tools by default, unless explicitly disabled via
@@ -539,7 +539,7 @@ Following is a list of the objects and functions available.
539539
540540
info("floob version is %s" % resolve.floob.version)
541541
542-
.. py:function:: intersects(range1: str | ~rez.vendor.version.version.VersionRange | ~rez.rex_bindings.VariantBinding | ~rez.rex_bindings.VersionBinding, range2: str) -> bool
542+
.. py:function:: intersects(range1: str | ~rez.version.VersionRange | ~rez.rex_bindings.VariantBinding | ~rez.rex_bindings.VersionBinding, range2: str) -> bool
543543
544544
A boolean function that returns True if the version or version range of the given
545545
object, intersects with the given version range. Valid objects to query include:

src/build_utils/license/apply_copyright

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ find ./src/rez/bind -name '*.py' > .lic.tmp
1515
find ./src/rez/cli -name '*.py' >> .lic.tmp
1616
find ./src/rez/tests -name '*.py' >> .lic.tmp
1717
find ./src/rez/utils -name '*.py' >> .lic.tmp
18-
find ./src/rez/vendor/version -name '*.py' >> .lic.tmp
1918
find ./src/rez/bind -name '*.py' >> .lic.tmp
2019
find ./src/rezgui -name '*.py' >> .lic.tmp
2120
find ./src/rezplugins -name '*.py' >> .lic.tmp

src/rez/bind/_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Utility functions for bind modules.
77
"""
88
from __future__ import absolute_import
9-
from rez.vendor.version.version import Version
9+
from rez.version import Version
1010
from rez.exceptions import RezBindError
1111
from rez.config import config
1212
from rez.util import which

src/rez/bind/arch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"""
88
from __future__ import absolute_import
99
from rez.package_maker import make_package
10-
from rez.vendor.version.version import Version
10+
from rez.version import Version
1111
from rez.bind._utils import check_version
1212
from rez.system import system
1313

src/rez/bind/hello_world.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from __future__ import absolute_import, print_function
1313

1414
from rez.package_maker import make_package
15-
from rez.vendor.version.version import Version
15+
from rez.version import Version
1616
from rez.utils.lint_helper import env
1717
from rez.utils.execution import create_executable_script, ExecutableScriptMode
1818
from rez.bind._utils import make_dirs, check_version

src/rez/bind/os.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"""
88
from __future__ import absolute_import
99
from rez.package_maker import make_package
10-
from rez.vendor.version.version import Version
10+
from rez.version import Version
1111
from rez.bind._utils import check_version
1212
from rez.system import system
1313

src/rez/bind/platform.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"""
88
from __future__ import absolute_import
99
from rez.package_maker import make_package
10-
from rez.vendor.version.version import Version
10+
from rez.version import Version
1111
from rez.bind._utils import check_version
1212
from rez.system import system
1313

src/rez/bind/rezgui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from rez.package_maker import make_package
1111
from rez.bind._utils import check_version, make_dirs
1212
from rez.system import system
13-
from rez.vendor.version.version import Version
13+
from rez.version import Version
1414
from rez.utils.lint_helper import env
1515
from rez.utils.execution import create_executable_script
1616
import shutil

0 commit comments

Comments
 (0)