From ed7d8ea28cfc908a7ce9f77014417db4dfce6da5 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Mon, 22 Apr 2019 22:39:21 +0100 Subject: [PATCH] Appveyor: added package_name to options --- scripts/appveyor.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/appveyor.py b/scripts/appveyor.py index 1a4f3f37..f5d8c46b 100755 --- a/scripts/appveyor.py +++ b/scripts/appveyor.py @@ -333,11 +333,10 @@ def build_psycopg(): def patch_package_name(): """Change the psycopg2 package name in the setup.py if required.""" - conf = os.environ.get('CONFIGURATION', 'psycopg2') - if conf == 'psycopg2': + if opt.package_name == 'psycopg2': return - logger.info("changing package name to %s", conf) + logger.info("changing package name to %s", opt.package_name) with (opt.package_dir / 'setup.py').open() as f: data = f.read() @@ -345,7 +344,7 @@ def patch_package_name(): # Replace the name of the package with what desired rex = re.compile(r"""name=["']psycopg2["']""") assert len(rex.findall(data)) == 1, rex.findall(data) - data = rex.sub(f'name="{conf}"', data) + data = rex.sub(f'name="{opt.package_name}"', data) with (opt.package_dir / 'setup.py').open('w') as f: f.write(data) @@ -358,7 +357,7 @@ def build_binary_packages(): add_pg_config_path() # Build .exe packages for whom still use them - if os.environ['CONFIGURATION'] == 'psycopg2': + if opt.package_name == 'psycopg2': run_python(['setup.py', 'bdist_wininst', "-d", opt.dist_dir]) # Build .whl packages @@ -386,7 +385,7 @@ def install_binary_package(): """Install the package from a packaged wheel.""" run_python( ['-m', 'pip', 'install', '--no-index', '-f', opt.dist_dir] - + [os.environ['CONFIGURATION']] + + [opt.package_name] ) @@ -719,6 +718,10 @@ class Options: """True if the Python architecture to build is 64 bits.""" return self.py_arch == 64 + @property + def package_name(self): + return os.environ.get('CONFIGURATION', 'psycopg2') + @property def package_version(self): """The psycopg2 version number to build."""