Skip to content

Commit

Permalink
Remove rez.backport (AcademySoftwareFoundation#1634)
Browse files Browse the repository at this point in the history
Signed-off-by: Bryce Gattis <brycegattis@yahoo.com>
  • Loading branch information
Pixel-Minions committed Sep 26, 2024
1 parent 037879c commit 9ce3e02
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 182 deletions.
1 change: 0 additions & 1 deletion src/rez/backport/__init__.py

This file was deleted.

37 changes: 0 additions & 37 deletions src/rez/backport/importlib.py

This file was deleted.

136 changes: 0 additions & 136 deletions src/rez/backport/lru_cache.py

This file was deleted.

1 change: 0 additions & 1 deletion src/rez/backport/ordereddict.py

This file was deleted.

1 change: 0 additions & 1 deletion src/rez/backport/zipfile.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/rez/cli/complete.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def _pop_arg(l, p):
comp_point += len(s)

# create parser for subcommand
from rez.backport.importlib import import_module
from importlib import import_module
data = subcommands[subcommand]
module_name = data.get("module_name", "rez.cli.%s" % subcommand)
mod = import_module(module_name)
Expand Down
2 changes: 1 addition & 1 deletion src/rez/cli/forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def command(opts, parser, extra_arg_groups=None):

if isinstance(doc["module"], str):
# refers to a rez module
from rez.backport.importlib import import_module
from importlib import import_module
namespace = "rez.%s" % doc["module"]
module = import_module(namespace)
else:
Expand Down
2 changes: 1 addition & 1 deletion src/rez/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
from rez.vendor.schema.schema import Schema, SchemaError, And, Or, Use
from rez.vendor import yaml
from rez.vendor.yaml.error import YAMLError
from rez.backport.lru_cache import lru_cache
import rez.deprecations
from contextlib import contextmanager
from functools import lru_cache
from inspect import ismodule
import os
import re
Expand Down
2 changes: 1 addition & 1 deletion src/rez/plugin_managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def register_plugin(self, plugin_name, plugin_class, plugin_module):

def load_plugins(self):
import pkgutil
from rez.backport.importlib import import_module
from importlib import import_module
type_module_name = 'rezplugins.' + self.type_name
package = import_module(type_module_name)

Expand Down
3 changes: 2 additions & 1 deletion src/rez/utils/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@
See the 'pets' unit test in tests/test_resources.py for a complete example.
"""
from functools import lru_cache

from rez.utils.data_utils import cached_property, AttributeForwardMeta, \
LazyAttributeMeta
from rez.config import config
from rez.exceptions import ResourceError
from rez.backport.lru_cache import lru_cache
from rez.utils.logging_ import print_debug


Expand Down
2 changes: 1 addition & 1 deletion src/rezplugins/package_repository/filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
Filesystem-based package repository
"""
from contextlib import contextmanager
from functools import lru_cache
import os.path
import os
import stat
Expand All @@ -32,7 +33,6 @@
from rez.utils.platform_ import platform_
from rez.utils.yaml import load_yaml
from rez.config import config
from rez.backport.lru_cache import lru_cache
from rez.vendor.schema.schema import Schema, Optional, And, Use, Or
from rez.version import Version, VersionRange

Expand Down

0 comments on commit 9ce3e02

Please sign in to comment.