10 Commits

3 changed files with 14 additions and 6 deletions

View File

@@ -18,7 +18,8 @@ jobs:
environment-name: test
environment-file: environment.yml
init-shell: >-
bash
bash
# create-args: >-
- name: pip install cadquery CQ-editor ... etc
shell: bash --login {0}
run: |
@@ -44,7 +45,10 @@ jobs:
run: |
micromamba activate test
micromamba info
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
echo $LD_LIBRARY_PATH
export LD_LIBRARY_PATH=/home/runner/micromamba/envs/test/lib
echo $LD_LIBRARY_PATH
pyinstaller --log-level=DEBUG pyinstaller_pip.spec ${{ github.event.inputs.type }}
cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
- uses: actions/upload-artifact@v4
with:
@@ -84,7 +88,7 @@ jobs:
micromamba activate test
micromamba info
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor-mac.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/CQ-editor.sh
- uses: actions/upload-artifact@v4
with:
name: CQ-editor-MacOS-x86_64
@@ -125,7 +129,7 @@ jobs:
micromamba activate test
micromamba info
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor-mac.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/CQ-editor.sh
- uses: actions/upload-artifact@v4
with:
name: CQ-editor-MacOS-arm64

View File

@@ -0,0 +1,4 @@
#!/bin/sh
export QT_MAC_WANTS_LAYER=1
chmod u+x ./CQ-editor/CQ-editor
QT_QPA_PLATFORM=cocoa PYOPENGL_PLATFORM=x11 ./CQ-editor/CQ-editor

View File

@@ -26,7 +26,7 @@ setup(
"CQ-editor = cq_editor.__main__:main",
]
},
python_requires=">=3.8,<3.12",
python_requires=">=3.10,<3.13",
install_requires=[
"logbook>=1",
"ipython",
@@ -35,6 +35,6 @@ setup(
"requests>=2,<3",
"spyder>=5,<6",
"pyqtgraph",
"numpy >= 1.24.1, <2",
"numpy >= 2, <3",
],
)