Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: miurahr/aqtinstall
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.1.18
Choose a base ref
...
head repository: miurahr/aqtinstall
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Aug 4, 2024

  1. fix: delete combination check

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 4, 2024
    Copy the full SHA
    d0260e0 View commit details
  2. fix; delete combinations.json

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 4, 2024
    Copy the full SHA
    3cd98d0 View commit details
  3. fix: remove unused json

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 4, 2024
    Copy the full SHA
    74963f9 View commit details
  4. fix: remove logic to check combination

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 4, 2024
    Copy the full SHA
    307d856 View commit details
  5. fix: remove logic to check combination

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 4, 2024
    Copy the full SHA
    65e7603 View commit details
  6. chore: remove json file from package

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 4, 2024
    Copy the full SHA
    b773467 View commit details
  7. fix: test: update expectations

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 4, 2024
    Copy the full SHA
    6c2960d View commit details
  8. docs: update CHANGELOG.rst

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 4, 2024
    Copy the full SHA
    2f998d2 View commit details

Commits on Aug 16, 2024

  1. Copy the full SHA
    7a0120f View commit details
  2. Update docs/CHANGELOG.rst

    Co-authored-by: Mozi <29089388+pzhlkj6612@users.noreply.github.com>
    miurahr and pzhlkj6612 authored Aug 16, 2024
    Copy the full SHA
    b551445 View commit details
  3. Update docs/CHANGELOG.rst

    miurahr authored Aug 16, 2024
    Copy the full SHA
    3c31e47 View commit details
  4. Merge pull request #814 from pzhlkj6612/combination-delete

    fix: remove logic to check or warn about unknown combinations
    miurahr authored Aug 16, 2024
    Copy the full SHA
    253349b View commit details

Commits on Aug 17, 2024

  1. Merge pull request #812 from miurahr/topic/miurahr/ci/combination-delete

    fix: delete combination check
    miurahr authored Aug 17, 2024
    Copy the full SHA
    73fc45e View commit details

Commits on Sep 29, 2024

  1. chore: drop python3.8 support and add 3.13

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Sep 29, 2024
    Copy the full SHA
    1307eb1 View commit details
  2. chore(ci): bump artifact-upload@v4

    and fix azure-pipelines job name
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Sep 29, 2024
    Copy the full SHA
    b942aab View commit details
  3. chore(ci): use install-qt subcommand

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Sep 29, 2024
    Copy the full SHA
    a90d93b View commit details
  4. chore(ci): drop python2 check

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Sep 29, 2024
    Copy the full SHA
    8566a89 View commit details
  5. docs: remove explanation of a legacy command syntax

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Sep 29, 2024
    Copy the full SHA
    2615219 View commit details
  6. refactor: test: update cases and expectations

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Sep 29, 2024
    Copy the full SHA
    2a8eb72 View commit details
  7. refactor: remove legacy commands

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Sep 29, 2024
    Copy the full SHA
    81c9839 View commit details
  8. style: remove unused field and apply black

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Sep 29, 2024
    Copy the full SHA
    fddd634 View commit details
  9. Merge pull request #821 from miurahr/topic/miurahr/drop-38-add-313

    chore: drop python 3.8 and add python 3.13
    miurahr authored Sep 29, 2024
    Copy the full SHA
    151ca25 View commit details

Commits on Oct 5, 2024

  1. chore(ci): bump target qt versions: 6.5.x, 6.6.x, 6.7.x and 6.8.0 (#822)

    * chore(ci): bump target qt versions
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): use install-qt subcommand
    
    - Drop backward compat check
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): wip
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): wip
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): fix qmake query checks
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): fix mingw targets
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): add target 6.8.0 and drop use of python3.9
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): add expectation for Qt 6.8
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): drop tox test from install-qt check
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): fix expectation for windows/android qt 6.6
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci):  wip
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci):  wip
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): add taget Qt 6.7.3
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): bump actions/setup-python@v5
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): azure-pipelines: drop test target Qt5
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): azure-pipelines: update triggers
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): azure-pipelines: disable Linux_ARM64
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): azure-pipelines: replace list with list-qt
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * chore(ci): azure-pipelines: no build check if list-qt
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    ---------
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr authored Oct 5, 2024
    6
    Copy the full SHA
    bdf8b4b View commit details
  2. chore(ci): azure: add a case win64_llvm_mingw

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Oct 5, 2024
    Copy the full SHA
    e38fb3a View commit details

Commits on Oct 6, 2024

  1. chore(ci): azure-pipelines bump to macos-14 (#827)

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr authored Oct 6, 2024
    Copy the full SHA
    7fbe587 View commit details
  2. fix: arch_dir of win64_llvm_mingw

    - set arch_dir to be llvm_mingw_64
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Oct 6, 2024
    Copy the full SHA
    7cfd15a View commit details
  3. Copy the full SHA
    bcc97e0 View commit details
  4. Update aqt/metadata.py

    miurahr authored Oct 6, 2024
    Copy the full SHA
    7371504 View commit details
  5. Copy the full SHA
    430e0f4 View commit details
  6. Copy the full SHA
    da23f09 View commit details
  7. Copy the full SHA
    20f8b7b View commit details
  8. black

    ddalcino committed Oct 6, 2024
    Copy the full SHA
    ff4fef3 View commit details

Commits on Oct 8, 2024

  1. Copy the full SHA
    5a2074b View commit details

Commits on Oct 9, 2024

  1. docs: add appendix to explain special case. (#830)

    * docs: add appendix to explain special case.
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * docs: update index.rst
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * docs: fix typo
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    * docs: fix reference
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    
    ---------
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr authored Oct 9, 2024
    Copy the full SHA
    ebc2e75 View commit details

Commits on Oct 10, 2024

  1. Copy the full SHA
    44ee2e8 View commit details

Commits on Oct 11, 2024

  1. Merge pull request #832 from jdpurcell/qt68winarmcc

    Fix for arch win64_msvc2022_arm64_cross_compiled
    miurahr authored Oct 11, 2024
    Copy the full SHA
    d3553b3 View commit details
  2. Update ci/generate_azure_pipelines_matrices.py

    Ignore autodesktop for llvm-mingw case
    miurahr authored Oct 11, 2024
    Copy the full SHA
    adce6e5 View commit details
  3. Merge pull request #823 from miurahr/topic/miurahr/drop-old-syntax

    refactor: remove legacy subcommand syntax
    miurahr authored Oct 11, 2024
    Copy the full SHA
    46d334a View commit details

Commits on Oct 12, 2024

  1. Merge pull request #826 from miurahr/topic/miurahr/fix-win64-llvm-mingw

    bug: fix error when instaling win64_llvm_mingw / Qt 6.7 and 6.8
    miurahr authored Oct 12, 2024
    Copy the full SHA
    0392095 View commit details

Commits on Nov 27, 2024

  1. Copy the full SHA
    1d528c2 View commit details
  2. search a list of possible extensions.

    currently qtwebengine, qtpdf.
    tsteven4 committed Nov 27, 2024
    Copy the full SHA
    aa222a5 View commit details

Commits on Nov 28, 2024

  1. fix pre 6.8.0 installs

    tsteven4 committed Nov 28, 2024
    Copy the full SHA
    5a13230 View commit details
  2. Copy the full SHA
    8301064 View commit details
  3. fix regression failures.

    tsteven4 committed Nov 28, 2024
    Copy the full SHA
    ee40b25 View commit details
  4. Copy the full SHA
    a1ffb93 View commit details

Commits on Nov 30, 2024

  1. Copy the full SHA
    a4cf04e View commit details
  2. attempt to fix types test

    tsteven4 committed Nov 30, 2024
    Copy the full SHA
    a590b6e View commit details
  3. Copy the full SHA
    1b2a9b2 View commit details

Commits on Dec 1, 2024

  1. Merge pull request #841 from tsteven4/operations

    Handle Updates.xml Operation extract elements. Fix the issue #840
    miurahr authored Dec 1, 2024
    Copy the full SHA
    4625000 View commit details
  2. Release v3.1.19

    Support Qt 6.8.1 and Python 3.13. amd many bug fixes.
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Dec 1, 2024
    Copy the full SHA
    58c2ce6 View commit details
Showing with 14,340 additions and 3,088 deletions.
  1. +0 −59 .github/workflows/check-combinations.yml
  2. +28 −16 .github/workflows/check.yml
  3. +3 −3 .github/workflows/codeql-analysis.yml
  4. +25 −9 .github/workflows/publish-to-pypi.yml
  5. +0 −25 .github/workflows/release-note.yml
  6. +53 −0 .github/workflows/run-linter.yml
  7. +61 −60 .github/workflows/test-install-qt.yml
  8. +2 −2 .github/workflows/upload-release-artifacts.yml
  9. +3 −0 .gitignore
  10. +19 −0 .reviewdog.yml
  11. +1 −1 MANIFEST.in
  12. +6 −5 README.rst
  13. +102 −38 aqt/archives.py
  14. +0 −1,310 aqt/combinations.json
  15. +377 −0 aqt/commercial.py
  16. +5 −3 aqt/exceptions.py
  17. +193 −43 aqt/helper.py
  18. +434 −171 aqt/installer.py
  19. +207 −29 aqt/metadata.py
  20. +33 −20 aqt/settings.ini
  21. +20 −10 aqt/updater.py
  22. +28 −34 azure-pipelines.yml
  23. BIN ci/codacy-coverage-reporter.jar
  24. +130 −201 ci/generate_azure_pipelines_matrices.py
  25. +0 −216 ci/generate_combinations.py
  26. +394 −0 ci/reviewdog_install.sh
  27. +14 −8 ci/settings.ini
  28. +471 −462 ci/steps.yml
  29. +73 −1 docs/CHANGELOG.rst
  30. +50 −0 docs/appendix.rst
  31. +7 −1 docs/authors.rst
  32. +45 −47 docs/cli.rst
  33. +47 −21 docs/getting_started.rst
  34. +1 −0 docs/index.rst
  35. +21 −22 pyproject.toml
  36. +38 −0 tests/data/all_os-673-wasm-multi-expect.json
  37. +575 −0 tests/data/all_os-673-wasm-multi-update.xml
  38. +38 −0 tests/data/all_os-673-wasm-single-expect.json
  39. +575 −0 tests/data/all_os-673-wasm-single-update.xml
  40. +42 −0 tests/data/all_os-680-wasm-multi-expect.json
  41. +567 −0 tests/data/all_os-680-wasm-multi-update.xml
  42. +42 −0 tests/data/all_os-680-wasm-single-expect.json
  43. +567 −0 tests/data/all_os-680-wasm-single-update.xml
  44. +97 −0 tests/data/all_os-681-src-doc-example-expect.json
  45. +1,496 −0 tests/data/all_os-681-src-doc-example-update.xml
  46. +1,784 −0 tests/data/linux-680-desktop-update.xml
  47. +4,456 −0 tests/data/windows-680-desktop-update.xml
  48. +24 −139 tests/test_cli.py
  49. +375 −0 tests/test_commercial.py
  50. +625 −114 tests/test_install.py
  51. +126 −17 tests/test_list.py
  52. +59 −0 tests/test_metadata.py
  53. +1 −1 tools/build_standalone.py
59 changes: 0 additions & 59 deletions .github/workflows/check-combinations.yml

This file was deleted.

44 changes: 28 additions & 16 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,54 @@
name: Check tox tests, lint and types
name: Check tox tests

on:
push:
branches:
- master
- releases/*
- master
- releases/*
pull_request:
types:
- opened
- synchronize
- reopened
- opened
- synchronize
- reopened

jobs:
check_document:
name: Check packaging 📦
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
AQT_TEST_EMAIL: ${{ secrets.AQT_TEST_EMAIL }}
AQT_TEST_PASSWORD: ${{ secrets.AQT_TEST_PASSWORD }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 20
fetch-tags: true
- name: Set up Python 3.9
uses: actions/setup-python@v4
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.12'
- name: Install tools
run: |
pip install -U pip
pip install tox tox-gh-actions coveralls coverage[toml]
- name: Check invocation with Python2
- name: Test
run: |
! python2 -m aqt help
[[ $(python2 -m aqt help) == "aqtinstall requires python 3!" ]]
- name: Check
run: tox
tox
coverage xml -o cobertura.xml
env:
PYTEST_ADDOPTS: --cov-config=pyproject.toml --cov --cov-append --verbose
- name: Upload Coverage
run: coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-java@v4
if: ( github.event_name == 'push' ) && ( github.ref == 'refs/heads/master' )
with:
distribution: 'temurin'
java-version: '21'
- name: Send coverage to codacy
if: ( github.event_name == 'push' ) && ( github.ref == 'refs/heads/master' )
run: |
java -jar ci/codacy-coverage-reporter.jar report -l Python -t ${PROJECT_TOKEN} -r cobertura.xml
env:
PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
34 changes: 25 additions & 9 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
@@ -10,26 +10,44 @@ on:
- v*

jobs:
build-n-publish:
name: Build and publish Python 🐍 distributions 📦 to PyPI
runs-on: ubuntu-20.04
build:
name: Build package
runs-on: ubuntu-22.04
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 50
- name: Fetch release tag
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
- name: Set up Python 3.10🐍
uses: actions/setup-python@v4
- name: Set up Python 3.12🐍
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- name: Install build and twine
run: python -m pip install build twine --user
- name: Build release assets
run: python -m build ./
- name: twine check
run: python -m twine check dist/*
- name: upload dist artifacts
uses: actions/upload-artifact@v4
with:
name: dists
path: dist/

publish:
name: publish Python 🐍 distributions 📦 to PyPI
runs-on: ubuntu-22.04
needs: build
permissions:
id-token: write
steps:
- name: download dist artifacts
uses: actions/download-artifact@v4
with:
name: dists
path: dist/
- name: Publish distribution 📦 to Test PyPI when releases branch
if: ${{ startsWith(github.event.ref, 'refs/heads/releases') }}
uses: pypa/gh-action-pypi-publish@release/v1
@@ -39,5 +57,3 @@ jobs:
- name: Publish distribution 📦 to PyPI
if: ${{ startsWith(github.event.ref, 'refs/tags') }}
uses: pypa/gh-action-pypi-publish@release/v1
with:
password: ${{ secrets.pypi_password }}
25 changes: 0 additions & 25 deletions .github/workflows/release-note.yml

This file was deleted.

53 changes: 53 additions & 0 deletions .github/workflows/run-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Run linter

on:
pull_request:
branches:
- master
types:
- opened
- synchronize
- reopened

jobs:
linter:
name: Linter
runs-on: ubuntu-24.04
permissions:
pull-requests: write
steps:
- uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.12'
architecture: x64
- name: Setup reviewdog
run: |
/usr/bin/sh ci/reviewdog_install.sh -b ./bin/ v0.20.3
- name: Install dependencies
run: |
pip install -U pip tox wheel setuptools coveralls coverage[toml]
pip install .[check]
- name: run reviewdog
run: |
./bin/reviewdog -runners=flake8,mypy -reporter=github-pr-review -conf=.reviewdog.yml
env:
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docs:
name: Document checks
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.12'
architecture: x64
- name: Install dependencies
run: |
pip install -U pip tox wheel setuptools setuptools_scm[toml]
- name: docs build and link check
run: |
tox -e docs
Loading