Remove rez.vendor.enum

src/rez/build_process.py

@@ -12,8 +12,8 @@
 from rez.release_hook import create_release_hooks
 from rez.resolver import ResolverStatus
 from rez.config import config
-from rez.vendor.enum import Enum
 from contextlib import contextmanager
+from enum import Enum
 from shlex import quote
 import getpass
 import os.path

src/rez/developer_package.py

@@ -9,8 +9,8 @@
 from rez.utils.execution import add_sys_paths
 from rez.utils.sourcecode import SourceCode
 from rez.utils.logging_ import print_info, print_error
-from rez.vendor.enum import Enum
 from inspect import isfunction
+from enum import Enum
 import os.path
 import stat
 

src/rez/pip.py

@@ -5,7 +5,6 @@
 from rez.packages import get_latest_package
 from rez.version import Version
 from rez.vendor.distlib.database import DistributionPath
-from rez.vendor.enum.enum import Enum
 from rez.vendor.packaging.version import Version as PackagingVersion
 from rez.vendor.packaging.specifiers import Specifier
 from rez.resolved_context import ResolvedContext
@@ -22,6 +21,7 @@
 import os
 from shlex import quote
 from pprint import pformat
+from enum import Enum
 import re
 import shutil
 import subprocess

src/rez/release_hook.py

@@ -4,7 +4,7 @@
 
 from rez.utils.logging_ import print_warning, print_debug
 from rez.packages import get_developer_package
-from rez.vendor.enum import Enum
+from enum import Enum
 
 
 def get_release_hook_types():

src/rez/resolved_context.py

@@ -35,14 +35,14 @@
 from rez.utils.resolve_graph import failure_detail_from_graph
 from rez.version import VersionRange
 from rez.version import Requirement
-from rez.vendor.enum import Enum
 from rez.vendor import yaml
 from rez.utils import json
 from rez.utils.yaml import dump_yaml
 from rez.utils.platform_ import platform_
 
 from contextlib import contextmanager
 from functools import wraps
+from enum import Enum
 import getpass
 import socket
 import threading

src/rez/resolver.py

@@ -9,9 +9,9 @@
 from rez.utils.memcached import memcached_client, pool_memcached_connections
 from rez.utils.logging_ import log_duration
 from rez.config import config
-from rez.vendor.enum import Enum
 from rez.version import Requirement
 from contextlib import contextmanager
+from enum import Enum
 from hashlib import sha1
 
 

src/rez/rex.py

@@ -7,6 +7,7 @@
 import re
 import traceback
 from fnmatch import fnmatch
+from enum import Enum
 from contextlib import contextmanager
 from string import Formatter
 from collections.abc import MutableMapping
@@ -22,7 +23,6 @@
 from rez.utils.data_utils import AttrDictWrapper
 from rez.utils.formatting import expandvars
 from rez.utils.platform_ import platform_
-from rez.vendor.enum import Enum
 
 
 #===============================================================================

src/rez/serialise.py

@@ -6,6 +6,7 @@
 Read and write data from file. File caching via a memcached server is supported.
 """
 from contextlib import contextmanager
+from enum import Enum
 from inspect import isfunction, ismodule
 import sys
 import stat
@@ -25,7 +26,6 @@
 from rez.utils import py23
 from rez.config import config
 from rez.vendor.atomicwrites import atomic_write
-from rez.vendor.enum import Enum
 from rez.vendor import yaml
 
 

src/rez/solver.py

@@ -23,8 +23,8 @@
  PackageFamilyNotFoundError, RezSystemError
 from rez.version import VersionRange
 from rez.version import VersionedObject, Requirement, RequirementList
-from rez.vendor.enum import Enum
 from contextlib import contextmanager
+from enum import Enum
 from itertools import product, chain
 import copy
 import time

src/rez/utils/execution.py

@@ -7,8 +7,8 @@
 """
 
 from rez.utils.yaml import dump_yaml
-from rez.vendor.enum import Enum
 from contextlib import contextmanager
+from enum import Enum
 import subprocess
 import sys
 import stat

src/rez/utils/formatting.py

@@ -6,10 +6,10 @@
 Utilities related to formatting output or translating input.
 """
 from string import Formatter
-from rez.vendor.enum import Enum
 from rez.version import Requirement
 from rez.exceptions import PackageRequestError
 from pprint import pformat
+from enum import Enum
 import os
 import os.path
 import re