h3n3/jmwright-CQ-Editor
1
0
Fork 0
mirror of https://github.com/jdegenstein/jmwright-CQ-Editor.git synced 2025-12-20 22:47:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: h3n3:0.30-dev-6
Branches Tags
h3n3:main h3n3:win-upx h3n3:pyside6 h3n3:run_and_main h3n3:mactrackpad h3n3:dev
h3n3:0.30-dev-8 h3n3:0.30-dev-7 h3n3:0.30-dev-6 h3n3:0.30-dev-5 h3n3:0.30-dev-4 h3n3:0.30-dev-3 h3n3:0.30-dev-2 h3n3:0.30-dev
...
compare: h3n3:0.30-dev-7
Branches Tags
h3n3:main h3n3:win-upx h3n3:pyside6 h3n3:run_and_main h3n3:mactrackpad h3n3:dev
h3n3:0.30-dev-8 h3n3:0.30-dev-7 h3n3:0.30-dev-6 h3n3:0.30-dev-5 h3n3:0.30-dev-4 h3n3:0.30-dev-3 h3n3:0.30-dev-2 h3n3:0.30-dev

10 Commits
0.30-dev-6 ... 0.30-dev-7

Author SHA1 Message Date
jdegenstein
0569294a2b setup.py -> numpy>=2,<3 and python 3.10 through 3.12 2024-12-01 13:54:01 -06:00
jdegenstein
0e6b47e21e pyinstaller-builds-actions-PIP-TAR.yml -> re-enable macos/windows builds after fixing linux build 2024-09-18 20:45:07 -05:00
jdegenstein
01ce43e1be pyinstaller-builds-actions-PIP-TAR.yml -> set LD_LIBRARY_PATH 2024-09-18 14:59:00 -05:00
jdegenstein
0499f2dc69 Update pyinstaller-builds-actions-PIP-TAR.yml 2024-09-18 11:00:27 -05:00
jdegenstein
5225408777 Update pyinstaller-builds-actions-PIP-TAR.yml 2024-09-18 10:59:29 -05:00
jdegenstein
8748b35e9f Update pyinstaller-builds-actions-PIP-TAR.yml 2024-09-18 10:52:27 -05:00
jdegenstein
7a279ad9a7 Update pyinstaller-builds-actions-PIP-TAR.yml 2024-09-18 09:36:44 -05:00
jdegenstein
cf3df6e95a pyinstaller-builds-actions-PIP-TAR.yml -> add linux libssl3-dev install via apt and temporarily disable other builds 2024-09-18 09:32:10 -05:00
jdegenstein
7015e70f4a pyinstaller-builds-actions-PIP-TAR.yml -> add mac-specific shell script 2024-09-17 14:59:07 -05:00
jdegenstein
f21b680ced Create CQ-editor-mac.sh 2024-09-17 14:57:46 -05:00
3 changed files with 14 additions and 6 deletions
Expand all files Collapse all files

10
.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml vendored
View File

@@ -19,6 +19,7 @@ jobs:
environment-file: environment.yml environment-file: environment.yml
init-shell: >- init-shell: >-
bash bash
# create-args: >-
- name: pip install cadquery CQ-editor ... etc - name: pip install cadquery CQ-editor ... etc
shell: bash --login {0} shell: bash --login {0}
run: | run: |
@@ -44,7 +45,10 @@ jobs:
run: | run: |
micromamba activate test micromamba activate test
micromamba info 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/ 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 - uses: actions/upload-artifact@v4
with: with:
@@ -84,7 +88,7 @@ jobs:
micromamba activate test micromamba activate test
micromamba info micromamba info
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }} 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 - uses: actions/upload-artifact@v4
with: with:
name: CQ-editor-MacOS-x86_64 name: CQ-editor-MacOS-x86_64
@@ -125,7 +129,7 @@ jobs:
micromamba activate test micromamba activate test
micromamba info micromamba info
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }} 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 - uses: actions/upload-artifact@v4
with: with:
name: CQ-editor-MacOS-arm64 name: CQ-editor-MacOS-arm64

4
pyinstaller/CQ-editor-mac.sh Normal file
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

4
setup.py
View File

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