h3n3/h3n3-jmwright-CQ-Editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: h3n3:win-upx
Branches Tags
h3n3:main h3n3:win-upx h3n3:pyside6 h3n3:run_and_main h3n3:mactrackpad h3n3:dev
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-6
Branches Tags
h3n3:main h3n3:win-upx h3n3:pyside6 h3n3:run_and_main h3n3:mactrackpad h3n3:dev
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

4 Commits
win-upx ... 0.30-dev-6

Author SHA1 Message Date
jdegenstein
9579757c98 debugger.py -> abspath to absolute 2024-08-22 12:34:28 -05:00
jdegenstein
5d8f651f97 widgets/editor.py -> abspath to absolute 2024-08-22 12:34:12 -05:00
jdegenstein
7f01d73f54 editor.py -> abspath to absolute 2024-08-22 12:33:40 -05:00
jdegenstein
d657da605a setup.py -> add numpy dep below v2 2024-08-22 12:27:06 -05:00
5 changed files with 125 additions and 125 deletions
Expand all files Collapse all files

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

@@ -9,127 +9,127 @@ on:
required: true required: true
default: 'dir' default: 'dir'
jobs: jobs:
# build-linux-x86_64: build-linux-x86_64:
# runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
# steps: steps:
# - uses: actions/checkout@v4 - uses: actions/checkout@v4
# - uses: mamba-org/setup-micromamba@v1 - uses: mamba-org/setup-micromamba@v1
# with: with:
# environment-name: test environment-name: test
# environment-file: environment.yml environment-file: environment.yml
# init-shell: >- init-shell: >-
# bash bash
# - name: pip install cadquery CQ-editor ... etc - name: pip install cadquery CQ-editor ... etc
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# sudo apt install -y libblas-dev libblas3 libblas64-3 libblas64-dev sudo apt install -y libblas-dev libblas3 libblas64-3 libblas64-dev
# sudo apt install -y libxkbcommon0 libxkbcommon-x11-0 libxcb-xinerama0 sudo apt install -y libxkbcommon0 libxkbcommon-x11-0 libxcb-xinerama0
# sudo apt install -y qtbase5-dev qt5-qmake sudo apt install -y qtbase5-dev qt5-qmake
# micromamba info micromamba info
# pip install pyopengl pip install pyopengl
# pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
# pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi
# pip install pyinstaller>=5.6 pip install pyinstaller>=5.6
# pip install path pip install path
# pip install jupyter-rfb pip install jupyter-rfb
# pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
# pip install git+https://github.com/gumyr/bd_warehouse pip install git+https://github.com/gumyr/bd_warehouse
# pip install git+https://github.com/meadiode/cq_gears.git@main pip install git+https://github.com/meadiode/cq_gears.git@main
# pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache" pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
# pip install git+https://github.com/gumyr/build123d pip install git+https://github.com/gumyr/build123d
# pip install git+https://github.com/JustinSDK/cqMore pip install git+https://github.com/JustinSDK/cqMore
# pip list pip list
# - name: Run build - name: Run build
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# 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 /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:
# name: CQ-editor-Linux-x86_64 name: CQ-editor-Linux-x86_64
# path: dist path: dist
# build-macos-x86_64: build-macos-x86_64:
# runs-on: macos-13 runs-on: macos-13
# steps: steps:
# - uses: actions/checkout@v4 - uses: actions/checkout@v4
# - uses: mamba-org/setup-micromamba@v1 - uses: mamba-org/setup-micromamba@v1
# with: with:
# environment-name: test environment-name: test
# environment-file: environment.yml environment-file: environment.yml
# init-shell: >- init-shell: >-
# bash bash
# - name: pip install cadquery CQ-editor ... etc - name: pip install cadquery CQ-editor ... etc
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# micromamba info micromamba info
# pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
# pip install --pre git+https://github.com/cadquery/cadquery casadi pip install --pre git+https://github.com/cadquery/cadquery casadi
# pip install pyinstaller>=5.6 pip install pyinstaller>=5.6
# pip install path pip install path
# pip uninstall -y PyQt5 pip uninstall -y PyQt5
# pip install PyQt5==5.15.7 pip install PyQt5==5.15.7
# pip install PyQtWebEngine==5.15.6 pip install PyQtWebEngine==5.15.6
# pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
# pip install git+https://github.com/gumyr/bd_warehouse pip install git+https://github.com/gumyr/bd_warehouse
# pip install git+https://github.com/meadiode/cq_gears.git@main pip install git+https://github.com/meadiode/cq_gears.git@main
# pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache" pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
# pip install git+https://github.com/gumyr/build123d pip install git+https://github.com/gumyr/build123d
# pip install git+https://github.com/JustinSDK/cqMore pip install git+https://github.com/JustinSDK/cqMore
# pip list pip list
# - name: Run build - name: Run build
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# 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.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
# - uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
# with: with:
# name: CQ-editor-MacOS-x86_64 name: CQ-editor-MacOS-x86_64
# path: dist path: dist
# build-macos-arm64: build-macos-arm64:
# runs-on: macos-14 runs-on: macos-14
# steps: steps:
# - uses: actions/checkout@v4 - uses: actions/checkout@v4
# - uses: mamba-org/setup-micromamba@v1 - uses: mamba-org/setup-micromamba@v1
# with: with:
# environment-name: test environment-name: test
# environment-file: environment.yml environment-file: environment.yml
# init-shell: >- init-shell: >-
# bash bash
# - name: pip install cadquery CQ-editor ... etc - name: pip install cadquery CQ-editor ... etc
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# micromamba info micromamba info
# pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
# pip install https://github.com/CadQuery/ocp-build-system/releases/download/7.7.2.0/cadquery_ocp-7.7.2-cp311-cp311-macosx_11_0_arm64.whl pip install https://github.com/CadQuery/ocp-build-system/releases/download/7.7.2.0/cadquery_ocp-7.7.2-cp311-cp311-macosx_11_0_arm64.whl
# pip install https://github.com/jdegenstein/nlopt-python/releases/download/2.7.1.3/nlopt-2.7.1-cp311-cp311-macosx_11_0_arm64.whl pip install https://github.com/jdegenstein/nlopt-python/releases/download/2.7.1.3/nlopt-2.7.1-cp311-cp311-macosx_11_0_arm64.whl
# pip install --pre git+https://github.com/cadquery/cadquery casadi pip install --pre git+https://github.com/cadquery/cadquery casadi
# pip install pyinstaller>=5.6 pip install pyinstaller>=5.6
# pip install path pip install path
# pip uninstall -y PyQt5 pip uninstall -y PyQt5
# pip install PyQt5==5.15.10 pip install PyQt5==5.15.10
# pip install PyQtWebEngine==5.15.6 pip install PyQtWebEngine==5.15.6
# pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
# pip install git+https://github.com/gumyr/bd_warehouse pip install git+https://github.com/gumyr/bd_warehouse
# pip install git+https://github.com/meadiode/cq_gears.git@main pip install git+https://github.com/meadiode/cq_gears.git@main
# pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache" pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
# pip install git+https://github.com/gumyr/build123d pip install git+https://github.com/gumyr/build123d
# pip install git+https://github.com/JustinSDK/cqMore pip install git+https://github.com/JustinSDK/cqMore
# pip list pip list
# - name: Run build - name: Run build
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# 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.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
# - uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
# with: with:
# name: CQ-editor-MacOS-arm64 name: CQ-editor-MacOS-arm64
# path: dist path: dist
build-windows: build-windows:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
@@ -144,7 +144,6 @@ jobs:
shell: bash --login {0} shell: bash --login {0}
run: | run: |
micromamba info micromamba info
choco install upx
pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
pip install --pre git+https://github.com/cadquery/cadquery casadi pip install --pre git+https://github.com/cadquery/cadquery casadi
pip install pyinstaller>=5.6 pip install pyinstaller>=5.6

2
cq_editor/editor.py
View File

@@ -148,7 +148,7 @@ class Editor(CodeEditor,ComponentMixin):
if not self.confirm_discard(): return if not self.confirm_discard(): return
curr_dir = Path(self.filename).abspath().dirname() curr_dir = Path(self.filename).absolute().dirname()
fname = get_open_filename(self.EXTENSIONS, curr_dir) fname = get_open_filename(self.EXTENSIONS, curr_dir)
if fname != '': if fname != '':
self.load_from_file(fname) self.load_from_file(fname)

2
cq_editor/widgets/debugger.py
View File

@@ -186,7 +186,7 @@ class Debugger(QObject, ComponentMixin):
def _exec(self, code, locals_dict, globals_dict): def _exec(self, code, locals_dict, globals_dict):
with ExitStack() as stack: with ExitStack() as stack:
fname = self.parent().components["editor"].filename fname = self.parent().components["editor"].filename
p = Path(fname if fname else "").abspath().dirname() p = Path(fname if fname else "").absolute().dirname()
if self.preferences["Add script dir to path"] and p.exists(): if self.preferences["Add script dir to path"] and p.exists():
sys.path.insert(0, p) sys.path.insert(0, p)

2
cq_editor/widgets/editor.py
View File

@@ -147,7 +147,7 @@ class Editor(CodeEditor,ComponentMixin):
if not self.confirm_discard(): return if not self.confirm_discard(): return
curr_dir = Path(self.filename).abspath().dirname() curr_dir = Path(self.filename).absolute().dirname()
fname = get_open_filename(self.EXTENSIONS, curr_dir) fname = get_open_filename(self.EXTENSIONS, curr_dir)
if fname != '': if fname != '':
self.load_from_file(fname) self.load_from_file(fname)

1
setup.py
View File

@@ -35,5 +35,6 @@ setup(
"requests>=2,<3", "requests>=2,<3",
"spyder>=5,<6", "spyder>=5,<6",
"pyqtgraph", "pyqtgraph",
"numpy >= 1.24.1, <2",
], ],
) )