From 950ffd6eb8f17e349eeb7694585d568a0382d9df Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Mon, 24 Dec 2018 12:05:34 -0800 Subject: [PATCH] deploy-ng: Add https://archive.panda3d.org/simple/opt as an optimized wheel index for release builds Fixes #469 --- direct/src/dist/commands.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/direct/src/dist/commands.py b/direct/src/dist/commands.py index 1ee2527950..ec69bf996f 100644 --- a/direct/src/dist/commands.py +++ b/direct/src/dist/commands.py @@ -315,11 +315,18 @@ class build_apps(setuptools.Command): if self.use_optimized_wheels: if not self.optimized_wheel_index: # Try to find an appropriate wheel index + + # Start with the release index + self.optimized_wheel_index = 'https://archive.panda3d.org/simple/opt' + + # See if a buildbot build is being used with open(self.requirements_path) as reqsfile: reqsdata = reqsfile.read() matches = re.search(r'--extra-index-url (https*://archive.panda3d.org/.*\b)', reqsdata) if matches and matches.group(1): - self.optimized_wheel_index = matches.group(1) + '/opt' + self.optimized_wheel_index = matches.group(1) + if not matches.group(1).endswith('opt'): + self.optimized_wheel_index += '/opt' assert self.optimized_wheel_index, 'An index for optimized wheels must be defined if use_optimized_wheels is set'