Skip to content

Commit

Permalink
Update version file paths to use VERSION.in (#1642)
Browse files Browse the repository at this point in the history
**Link the Issue(s) this Pull Request is related to.**
#1637

**Summarize your change.**
- Updated version file paths in setup scripts to use VERSION.in (correct
file name in the Opencue project) instead of VERSION
- Fixes the error when running `sandbox/install-client-sources.sh`
- `sandbox/install-client-sources.sh` calls `pip install pycue/
pyoutline/ cueadmin/ cuesubmit/ cuegui/` and the `setup.py` in these
directories should use `VERSION.in` not `VERSION`
  • Loading branch information
ramonfigueiredo authored Jan 27, 2025
1 parent 5a9eb52 commit 012112b
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions cueadmin/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

version = 'unknown'
possible_version_paths = [
os.path.join(cueadmin_dir, 'VERSION'),
os.path.join(os.path.dirname(cueadmin_dir), 'VERSION'),
os.path.join(cueadmin_dir, 'VERSION.in'),
os.path.join(os.path.dirname(cueadmin_dir), 'VERSION.in'),
]
for possible_version_path in possible_version_paths:
if os.path.exists(possible_version_path):
Expand Down
4 changes: 2 additions & 2 deletions cuegui/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

version = 'unknown'
possible_version_paths = [
os.path.join(cuegui_dir, 'VERSION'),
os.path.join(os.path.dirname(cuegui_dir), 'VERSION'),
os.path.join(cuegui_dir, 'VERSION.in'),
os.path.join(os.path.dirname(cuegui_dir), 'VERSION.in'),
]
for possible_version_path in possible_version_paths:
if os.path.exists(possible_version_path):
Expand Down
4 changes: 2 additions & 2 deletions cuesubmit/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

version = 'unknown'
possible_version_paths = [
os.path.join(cuesubmit_dir, 'VERSION'),
os.path.join(os.path.dirname(cuesubmit_dir), 'VERSION'),
os.path.join(cuesubmit_dir, 'VERSION.in'),
os.path.join(os.path.dirname(cuesubmit_dir), 'VERSION.in'),
]
for possible_version_path in possible_version_paths:
if os.path.exists(possible_version_path):
Expand Down
4 changes: 2 additions & 2 deletions pycue/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

version = 'unknown'
possible_version_paths = [
os.path.join(pycue_dir, 'VERSION'),
os.path.join(os.path.dirname(pycue_dir), 'VERSION'),
os.path.join(pycue_dir, 'VERSION.in'),
os.path.join(os.path.dirname(pycue_dir), 'VERSION.in'),
]
for possible_version_path in possible_version_paths:
if os.path.exists(possible_version_path):
Expand Down
4 changes: 2 additions & 2 deletions pyoutline/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

version = 'unknown'
possible_version_paths = [
os.path.join(pyoutline_dir, 'VERSION'),
os.path.join(os.path.dirname(pyoutline_dir), 'VERSION'),
os.path.join(pyoutline_dir, 'VERSION.in'),
os.path.join(os.path.dirname(pyoutline_dir), 'VERSION.in'),
]
for possible_version_path in possible_version_paths:
if os.path.exists(possible_version_path):
Expand Down
4 changes: 2 additions & 2 deletions rqd/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

version = 'unknown'
possible_version_paths = [
os.path.join(rqd_dir, 'VERSION'),
os.path.join(os.path.dirname(rqd_dir), 'VERSION'),
os.path.join(rqd_dir, 'VERSION.in'),
os.path.join(os.path.dirname(rqd_dir), 'VERSION.in'),
]
for possible_version_path in possible_version_paths:
if os.path.exists(possible_version_path):
Expand Down

0 comments on commit 012112b

Please sign in to comment.