From 086659e576ff64f4bca74298cd6e9b4075abc423 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 13:24:54 -0800 Subject: [PATCH 1/3] Update cibuildwheel to 2.3.1 --- .github/workflows/build-aarch64.yml | 2 +- .github/workflows/build-wheels.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-aarch64.yml b/.github/workflows/build-aarch64.yml index c309f1bab..16485cad5 100644 --- a/.github/workflows/build-aarch64.yml +++ b/.github/workflows/build-aarch64.yml @@ -38,7 +38,7 @@ jobs: python3 -m venv venv source venv/bin/activate python -m pip install --upgrade pip - python -m pip install cibuildwheel==2.2.2 + python -m pip install cibuildwheel==2.3.1 - name: Lint source with flake8 run: | diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 9512680ca..36bd409eb 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -54,7 +54,7 @@ jobs: python -m build --sdist --outdir dist . - name: Build ${{ matrix.os }} wheels and test - uses: joerick/cibuildwheel@v2.2.2 + uses: joerick/cibuildwheel@v2.3.1 with: output-dir: dist env: From e73751ea75794e3b998613af43e491423a8fe6de Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 13:38:24 -0800 Subject: [PATCH 2/3] use single quotes in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1b0d7b2b1..0a12feb5f 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def build_extension(self, ext): build_args += ["--", "-j", "6"] env = os.environ.copy() - env["CXXFLAGS"] = '{} -DVERSION_INFO=\\"{}\\"'.format( + env["CXXFLAGS"] = '{} -DVERSION_INFO=\\\'{}\\\''.format( env.get("CXXFLAGS", ""), self.distribution.get_version() ) if not os.path.exists(self.build_temp): From 13b27f4e79ad1ae3768aab16def7c7c66f0df686 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 13:49:18 -0800 Subject: [PATCH 3/3] Revert e73751e and change to single \ later --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0a12feb5f..4d2482b9d 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def build_extension(self, ext): build_args += ["--", "-j", "6"] env = os.environ.copy() - env["CXXFLAGS"] = '{} -DVERSION_INFO=\\\'{}\\\''.format( + env["CXXFLAGS"] = '{} -DVERSION_INFO=\\"{}\\"'.format( env.get("CXXFLAGS", ""), self.distribution.get_version() ) if not os.path.exists(self.build_temp): @@ -176,7 +176,7 @@ def build_extensions(self): opts.append("-fvisibility=hidden") elif ct == "msvc": if sys.version_info < (3, 9): - ver_flag = '/DVERSION_INFO=\\"%s\\"' + ver_flag = '/DVERSION_INFO=\"%s\"' else: ver_flag = '-DVERSION_INFO="%s"' opts.append(ver_flag % self.distribution.get_version())