From 012112bc55312984df32ca9a0c0723791b720fc4 Mon Sep 17 00:00:00 2001 From: Ramon Figueiredo Date: Mon, 27 Jan 2025 12:03:46 -0800 Subject: [PATCH] Update version file paths to use VERSION.in (#1642) **Link the Issue(s) this Pull Request is related to.** https://github.com/AcademySoftwareFoundation/OpenCue/issues/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` --- cueadmin/setup.py | 4 ++-- cuegui/setup.py | 4 ++-- cuesubmit/setup.py | 4 ++-- pycue/setup.py | 4 ++-- pyoutline/setup.py | 4 ++-- rqd/setup.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cueadmin/setup.py b/cueadmin/setup.py index cceac811d..dbad2addf 100644 --- a/cueadmin/setup.py +++ b/cueadmin/setup.py @@ -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): diff --git a/cuegui/setup.py b/cuegui/setup.py index 6ca45dc2b..4fe2c7bbd 100644 --- a/cuegui/setup.py +++ b/cuegui/setup.py @@ -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): diff --git a/cuesubmit/setup.py b/cuesubmit/setup.py index 272f29408..7e11154cb 100644 --- a/cuesubmit/setup.py +++ b/cuesubmit/setup.py @@ -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): diff --git a/pycue/setup.py b/pycue/setup.py index ad6e29f87..99d04a5cc 100644 --- a/pycue/setup.py +++ b/pycue/setup.py @@ -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): diff --git a/pyoutline/setup.py b/pyoutline/setup.py index c9d2ed088..60ca2322b 100644 --- a/pyoutline/setup.py +++ b/pyoutline/setup.py @@ -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): diff --git a/rqd/setup.py b/rqd/setup.py index 67df8364f..bf58e98fa 100644 --- a/rqd/setup.py +++ b/rqd/setup.py @@ -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):