forked from AcademySoftwareFoundation/rez
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove console_scripts and simplify install.py
Now the setup.py is able to make binary scripts by itself and install them as data_files under rez production dir 'bin/rez' (or 'Scripts/rez' on Windows). However, console_scripts 'rez' is conflicting with the rez production dir 'rez'. Since the previous install.py already removing those scripts before doing the *patch*, console_scripts should be ignored in new setup.py. See AcademySoftwareFoundation#625 and AcademySoftwareFoundation#662 for reason why adding console_scripts in the first place.
- Loading branch information
1 parent
0ee46bc
commit 70efc17
Showing
2 changed files
with
8 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -94,7 +94,8 @@ def patch_rez_binaries(self): | |
options=dict(interpreter_args=["-E"]) | ||
) | ||
|
||
# Add rez production install validation file | ||
# Add validation file as production rez install | ||
# Do not remove - rez uses this! | ||
validation_file = os.path.join(build_path, ".rez_production_install") | ||
with open(validation_file, "w") as vfn: | ||
vfn.write(_rez_version) | ||
|
@@ -121,7 +122,7 @@ def copy_completion_scripts(self): | |
self._append_data_files([(rel_dest_path, rel_src_paths)]) | ||
|
||
|
||
dist = setup( | ||
setup( | ||
name="rez", | ||
version=_rez_version, | ||
description=("A cross-platform packaging system that can build and " | ||
|
@@ -135,7 +136,7 @@ def copy_completion_scripts(self): | |
author_email="[email protected]", | ||
license="LGPL", | ||
entry_points={ | ||
"console_scripts": get_specifications().values() | ||
"console_scripts": [] | ||
}, | ||
include_package_data=True, | ||
zip_safe=False, | ||
|