Update setup.py

pyinstaller-builds-actions-PIP-TAR.yml -> re-enable macos/windows builds after fixing linux build
2024-10-05 23:38:36 +02:00 · 2024-10-05 23:35:38 +02:00 · 2024-09-18 20:45:07 -05:00 · 2024-09-18 14:59:00 -05:00 · 2024-09-18 11:00:27 -05:00 · 2024-09-18 10:59:29 -05:00
6 changed files with 134 additions and 126 deletions
--- a/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
+++ b/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
@@ -9,127 +9,131 @@ on:
        required: true
        default: 'dir'
 jobs:
-  # build-linux-x86_64:
-  #   runs-on: ubuntu-22.04
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   - uses: mamba-org/setup-micromamba@v1
-  #     with:
-  #       environment-name: test
-  #       environment-file: environment.yml
-  #       init-shell: >-
-  #           bash
-  #   - name: pip install cadquery CQ-editor ... etc
-  #     shell: bash --login {0}
-  #     run: |
-  #       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 qtbase5-dev qt5-qmake
-  #       micromamba info
-  #       pip install pyopengl
-  #       pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
-  #       pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi
-  #       pip install pyinstaller>=5.6
-  #       pip install path
-  #       pip install jupyter-rfb
-  #       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/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 git+https://github.com/gumyr/build123d
-  #       pip install git+https://github.com/JustinSDK/cqMore
-  #       pip list
-  #   - name: Run build
-  #     shell: bash --login {0}
-  #     run: |
-  #       micromamba activate test
-  #       micromamba info
-  #       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/
-  #   - uses: actions/upload-artifact@v4
-  #     with:
-  #       name: CQ-editor-Linux-x86_64
-  #       path: dist
-  # build-macos-x86_64:
-  #   runs-on: macos-13
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   - uses: mamba-org/setup-micromamba@v1
-  #     with:
-  #       environment-name: test
-  #       environment-file: environment.yml
-  #       init-shell: >-
-  #           bash
-  #   - name: pip install cadquery CQ-editor ... etc
-  #     shell: bash --login {0}
-  #     run: |
-  #       micromamba info
-  #       pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
-  #       pip install --pre git+https://github.com/cadquery/cadquery casadi
-  #       pip install pyinstaller>=5.6
-  #       pip install path
-  #       pip uninstall -y PyQt5
-  #       pip install PyQt5==5.15.7
-  #       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/bd_warehouse
-  #       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 git+https://github.com/gumyr/build123d
-  #       pip install git+https://github.com/JustinSDK/cqMore
-  #       pip list
-  #   - name: Run build
-  #     shell: bash --login {0}
-  #     run: |
-  #       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/
-  #   - uses: actions/upload-artifact@v4
-  #     with:
-  #       name: CQ-editor-MacOS-x86_64
-  #       path: dist
-  # build-macos-arm64:
-  #   runs-on: macos-14
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   - uses: mamba-org/setup-micromamba@v1
-  #     with:
-  #       environment-name: test
-  #       environment-file: environment.yml
-  #       init-shell: >-
-  #           bash
-  #   - name: pip install cadquery CQ-editor ... etc
-  #     shell: bash --login {0}
-  #     run: |
-  #       micromamba info
-  #       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/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 pyinstaller>=5.6
-  #       pip install path
-  #       pip uninstall -y PyQt5
-  #       pip install PyQt5==5.15.10
-  #       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/bd_warehouse
-  #       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 git+https://github.com/gumyr/build123d
-  #       pip install git+https://github.com/JustinSDK/cqMore
-  #       pip list
-  #   - name: Run build
-  #     shell: bash --login {0}
-  #     run: |
-  #       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/
-  #   - uses: actions/upload-artifact@v4
-  #     with:
-  #       name: CQ-editor-MacOS-arm64
-  #       path: dist
+  build-linux-x86_64:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+    - uses: mamba-org/setup-micromamba@v1
+      with:
+        environment-name: test
+        environment-file: environment.yml
+        init-shell: >-
+          bash
+        # create-args: >-
+    - name: pip install cadquery CQ-editor ... etc
+      shell: bash --login {0}
+      run: |
+        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 qtbase5-dev qt5-qmake
+        micromamba info
+        pip install pyopengl
+        pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
+        pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi
+        pip install pyinstaller>=5.6
+        pip install path
+        pip install jupyter-rfb
+        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/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 git+https://github.com/gumyr/build123d
+        pip install git+https://github.com/JustinSDK/cqMore
+        pip list
+    - name: Run build
+      shell: bash --login {0}
+      run: |
+        micromamba activate test
+        micromamba info
+        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:
+        name: CQ-editor-Linux-x86_64
+        path: dist
+  build-macos-x86_64:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v4
+    - uses: mamba-org/setup-micromamba@v1
+      with:
+        environment-name: test
+        environment-file: environment.yml
+        init-shell: >-
+            bash
+    - name: pip install cadquery CQ-editor ... etc
+      shell: bash --login {0}
+      run: |
+        micromamba info
+        pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
+        pip install --pre git+https://github.com/cadquery/cadquery casadi
+        pip install pyinstaller>=5.6
+        pip install path
+        pip uninstall -y PyQt5
+        pip install PyQt5==5.15.7
+        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/bd_warehouse
+        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 git+https://github.com/gumyr/build123d
+        pip install git+https://github.com/JustinSDK/cqMore
+        pip list
+    - name: Run build
+      shell: bash --login {0}
+      run: |
+        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-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
+        path: dist
+  build-macos-arm64:
+    runs-on: macos-14
+    steps:
+    - uses: actions/checkout@v4
+    - uses: mamba-org/setup-micromamba@v1
+      with:
+        environment-name: test
+        environment-file: environment.yml
+        init-shell: >-
+            bash
+    - name: pip install cadquery CQ-editor ... etc
+      shell: bash --login {0}
+      run: |
+        micromamba info
+        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/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 pyinstaller>=5.6
+        pip install path
+        pip uninstall -y PyQt5
+        pip install PyQt5==5.15.10
+        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/bd_warehouse
+        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 git+https://github.com/gumyr/build123d
+        pip install git+https://github.com/JustinSDK/cqMore
+        pip list
+    - name: Run build
+      shell: bash --login {0}
+      run: |
+        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-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
+        path: dist
  build-windows:
    runs-on: windows-latest
    steps:
@@ -144,7 +148,6 @@ jobs:
      shell: bash --login {0}
      run: |
        micromamba info
-        choco install upx
        pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
        pip install --pre git+https://github.com/cadquery/cadquery casadi
        pip install pyinstaller>=5.6
--- a/cq_editor/editor.py
+++ b/cq_editor/editor.py
@@ -148,7 +148,7 @@ class Editor(CodeEditor,ComponentMixin):
        
        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)
        if fname != '':
            self.load_from_file(fname)
--- a/cq_editor/widgets/debugger.py
+++ b/cq_editor/widgets/debugger.py
@@ -186,7 +186,7 @@ class Debugger(QObject, ComponentMixin):
    def _exec(self, code, locals_dict, globals_dict):
        with ExitStack() as stack:
            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():
                sys.path.insert(0, p)
--- a/cq_editor/widgets/editor.py
+++ b/cq_editor/widgets/editor.py
@@ -147,7 +147,7 @@ class Editor(CodeEditor,ComponentMixin):
        
        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)
        if fname != '':
            self.load_from_file(fname)
--- a/pyinstaller/CQ-editor-mac.sh
+++ b/pyinstaller/CQ-editor-mac.sh
@@ -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
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ setup(
            "CQ-editor = cq_editor.__main__:main",
        ]
    },
-    python_requires=">=3.8,<3.12",
+    python_requires=">=3.8,<3.13",
    install_requires=[
        "logbook>=1",
        "ipython",
@@ -35,5 +35,6 @@ setup(
        "requests>=2,<3",
        "spyder>=5,<6",
        "pyqtgraph",
+        "numpy >= 1.24.1, <2",
    ],
 )
Author	SHA1	Message	Date
Hendrie Bosch	f95e31b636	Update setup.py	2024-10-05 23:38:36 +02:00
Hendrie Bosch	3099fa560e	Update setup.py	2024-10-05 23:35:38 +02: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
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