Skip to content

Commit cd1ea2a

Browse files
committed
update to fit latest change on Rez
1 parent 687f148 commit cd1ea2a

File tree

6 files changed

+7
-25
lines changed

6 files changed

+7
-25
lines changed

setup.py

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,19 @@
11
from __future__ import print_function, with_statement
22

3-
import sys
43
import os
4+
import sys
55
import fnmatch
66
from setuptools import setup, find_packages
7-
from setuptools.command import install_scripts
87

98

109
# carefully import some sourcefiles that are standalone
1110
source_path = os.path.dirname(os.path.realpath(__file__))
1211
src_path = os.path.join(source_path, "src")
1312
sys.path.insert(0, src_path)
1413

15-
from deliver._entry_points import get_specifications
1614
from deliver._version import version
1715

1816

19-
class InstallRezScripts(install_scripts.install_scripts):
20-
21-
def run(self):
22-
from rez.utils.installer import create_rez_production_scripts
23-
install_scripts.install_scripts.run(self)
24-
# patch_rez_binaries
25-
build_path = os.path.join(self.build_dir, "rez")
26-
install_path = os.path.join(self.install_dir, "rez")
27-
specifications = get_specifications().values()
28-
create_rez_production_scripts(build_path, specifications)
29-
self.outfiles += self.copy_tree(build_path, install_path)
30-
31-
3217
def find_files(pattern, path=None, root="deliver", prefix=""):
3318
paths = []
3419
basepath = os.path.realpath(os.path.join("src", root))
@@ -49,7 +34,7 @@ def find_files(pattern, path=None, root="deliver", prefix=""):
4934

5035

5136
setup(
52-
name="deliver",
37+
name="rez-deliver",
5338
package_data={
5439
"deliver":
5540
find_files("rezconfig") +
@@ -78,9 +63,6 @@ def find_files(pattern, path=None, root="deliver", prefix=""):
7863
version=version,
7964
description="Rez cli for releasing packages from GitHub repositories",
8065
long_description=long_description,
81-
cmdclass={
82-
"install_scripts": InstallRezScripts,
83-
},
8466
classifiers=[
8567
"Development Status :: 5 - Production/Stable",
8668
"License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",

src/deliver/git.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from rez.config import config as rezconfig
77

88

9-
g = Github(rezconfig.plugins.extension.deliver.github_token)
9+
g = Github(rezconfig.plugins.command.deliver.github_token)
1010

1111

1212
def clone(url, dst, branch=None, single_branch=True):

src/deliver/pkgs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# silencing rez logger, e.g. on package preprocessing
2626
rez_logger.setLevel(logging.WARNING)
2727

28-
deliverconfig = rezconfig.plugins.extension.deliver
28+
deliverconfig = rezconfig.plugins.command.deliver
2929

3030

3131
def expand_path(path):

src/deliver/rezplugins/extension/deliver.py renamed to src/deliver/rezplugins/command/deliver.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
Rez developer package delivering tool
33
"""
4-
from rez.extension import Extension
4+
from rez.command import Command
55

66

77
command_behavior = {}
@@ -77,7 +77,7 @@ def command(opts, parser=None, extra_arg_groups=None):
7777
"view available packages.")
7878

7979

80-
class ExtensionDeliver(Extension):
80+
class DeliverCommand(Command):
8181
schema_dict = {
8282
"dev_repository_roots": list,
8383
"rez_source_path": str,
@@ -92,4 +92,4 @@ def name(cls):
9292

9393

9494
def register_plugin():
95-
return ExtensionDeliver
95+
return DeliverCommand

0 commit comments

Comments
 (0)