From 70855aec4ee99f3d2b10ed66388253949f4f6a1a Mon Sep 17 00:00:00 2001 From: Boldi Date: Tue, 21 Nov 2023 16:14:05 +0000 Subject: [PATCH] Trying to build on GitHub --- .github/workflows/deploy.yml | 14 +++++++------- pyproject.toml | 14 -------------- zxlive/pysidedeploy.spec => pysidedeploy.spec | 6 +++--- zxlive/__main__.bin | 0 4 files changed, 10 insertions(+), 24 deletions(-) rename zxlive/pysidedeploy.spec => pysidedeploy.spec (93%) create mode 100644 zxlive/__main__.bin diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4b800190..6b87d294 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,8 +13,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] -# os: [ ubuntu-latest ] - python-version: [ 3.11 ] + python-version: [ 3.10 ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -22,11 +21,12 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Install base package - run: pip install cx_freeze - - name: Build MacOS -# if: matrix.os == 'ubuntu-latest' - run: python deploy.py build + cache: 'pip' + - name: Install dependencies + run: + pip install . + - name: Build ZXLive + run: pyside6-deploy -c pysidedeploy.spec -f - name: Upload build uses: actions/upload-artifact@v3 with: diff --git a/pyproject.toml b/pyproject.toml index 9a352e57..123cf270 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,6 @@ test = [ "pylint", "pytest-qt", ] -deploy = ["cx_Freeze"] [project.urls] Homepage = "https://github.com/Quantomatic/zxlive" @@ -79,16 +78,3 @@ disallow_untyped_defs = true disable_error_code = [ "import", ] - -[tool.distutils.build_exe] -excludes = [ - "IPython", - "jupyter", - "pytest", - "mypy", -] -zip_include_packages = [ - "encodings", - "zxlive", - "pyzx", -] diff --git a/zxlive/pysidedeploy.spec b/pysidedeploy.spec similarity index 93% rename from zxlive/pysidedeploy.spec rename to pysidedeploy.spec index 8a61a12c..9ff4b8b0 100755 --- a/zxlive/pysidedeploy.spec +++ b/pysidedeploy.spec @@ -7,7 +7,7 @@ project_dir = ./zxlive # source file path input_file = __main__.py # directory where exec is stored -exec_directory = ./zxlive +exec_directory = ./build # path to .pyproject project file project_file = @@ -17,9 +17,9 @@ python_path = python # python packages to install # ordered-set = increase compile time performance of nuitka packaging # zstandard = provides final executable size optimization -packages = nuitka==1.5.5,ordered_set,zstandard +packages = nuitka==1.6.*,ordered_set,zstandard # buildozer = for deploying Android application -android_packages = buildozer==1.5.0,cython==0.29.33 +android_packages = buildozer==1.5.*,cython==0.29.* [qt] # comma separated path to qml files required diff --git a/zxlive/__main__.bin b/zxlive/__main__.bin new file mode 100644 index 00000000..e69de29b