From 6b58735151864d4fde26e081163cecc4e3834363 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 6 May 2021 10:24:41 -0400 Subject: [PATCH 1/4] Hard code v2.1 in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ff0fe11..fd86107 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ def pad_version(v, segment_count=3): # in some other way? qt_version = pad_version(os.environ.setdefault('QT_VERSION', '5.15.1')) -qt5_applications_wrapper_version = versioneer.get_versions()['version'] +qt5_applications_wrapper_version = '2.1' qt5_applications_version = '{}.{}'.format(qt_version, qt5_applications_wrapper_version) From b2a5bfa26b829c5c45490be2c6f22811286d7410 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 6 May 2021 15:23:29 -0400 Subject: [PATCH 2/4] only build macOS --- .github/workflows/ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9445823..59e21ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,14 @@ jobs: fail-fast: false matrix: os: - - name: Linux - runs-on: ubuntu-latest - python_platform: linux - container: docker://python:{0}-buster - - name: Windows - runs-on: windows-latest - python_platform: win32 - vs_path: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat +# - name: Linux +# runs-on: ubuntu-latest +# python_platform: linux +# container: docker://python:{0}-buster +# - name: Windows +# runs-on: windows-latest +# python_platform: win32 +# vs_path: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat - name: macOS runs-on: macos-latest python_platform: darwin @@ -141,14 +141,14 @@ jobs: fail-fast: false matrix: os: - - name: Linux - runs-on: ubuntu-latest - python_platform: linux - container: docker://python:{0}-buster - - name: Windows - runs-on: windows-latest - python_platform: win32 - vs_path: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat +# - name: Linux +# runs-on: ubuntu-latest +# python_platform: linux +# container: docker://python:{0}-buster +# - name: Windows +# runs-on: windows-latest +# python_platform: win32 +# vs_path: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat - name: macOS runs-on: macos-latest python_platform: darwin From faab3e1d5738d4a6e22555a7782d3482a92b0e47 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 19 May 2021 18:36:15 -0400 Subject: [PATCH 3/4] skip .a files on macos --- build.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.py b/build.py index 6aa2848..78a56c1 100644 --- a/build.py +++ b/build.py @@ -1073,6 +1073,12 @@ def exclude_webengine_filter(path): action.linux_less_specific_so_target() for action in copy_actions } + elif configuration.platform == 'darwin': + copy_actions = { + action + for action in copy_actions + if action.destination.suffix != '.a' + } checkpoint('Write Applications dict') applications_py = destinations.package / '_applications.py' From 47fbce716155fa4b21fdb3eb82bf2245383abaae Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 19 May 2021 23:34:38 -0400 Subject: [PATCH 4/4] build: empty commit