Skip to content
Closed

e2.1 #14

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -71,8 +71,9 @@ jobs:
QT_VERSION: ${{ matrix.qt.qt_version }}

steps:
- name: Checkout
uses: actions/checkout@v1
- uses: actions/checkout@v1
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Set up Python ${{ matrix.python.name }}-${{ matrix.bitness.name }}
if: matrix.os.python_platform != 'linux'
uses: actions/setup-python@v2
Expand Down Expand Up @@ -141,14 +142,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
Expand Down Expand Up @@ -208,8 +209,9 @@ jobs:
QT_VERSION: ${{ matrix.qt.qt_version }}

steps:
- name: Checkout
uses: actions/checkout@v1
- uses: actions/checkout@v1
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Download
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -265,8 +267,9 @@ jobs:
needs:
- test
steps:
- name: Checkout
uses: actions/checkout@v1
- uses: actions/checkout@v1
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Download all wheels
uses: actions/download-artifact@v1
with:
Expand Down
6 changes: 6 additions & 0 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down