OCP 7.7.2 (#1440)

* Try with OCP 7.7.2

* Use latest ubuntu

* Try with 3.12

* Use packaged stubs

* Add pip install back

* Back to py311

* Use conda-forge for ocp

* And back to py3.12

* Use 3.12

* Remove click

* Add click without pin

* Update black version and remove click again

* Require qt build of vtk

* Update meta.yaml for ocp 7.7.2

* Fix syntax warning

* use forked black

* Remove black

* Install black via environment.yml

* Black already handled via env yml

* Mention black version in the readme

Author: adam-urbanczyk

README.md

@@ -210,7 +210,7 @@ If you are going to contribute code, make sure to follow this steps:
 - Consider adding an example to the documentation showing your cool new
   feature!
 - Make sure nothing is broken (run the complete test suite with `pytest`)
-- Run `black` to autoformat your code and make sure your code style complies
+- Run `black` from [our fork](https://github.com/CadQuery/black) to autoformat your code and make sure your code style complies
   with CadQuery's
 - Push the changes to your fork and open a pull-request upstream
 - Keep an eye on the automated feedback you will receive from the CI pipelines;

appveyor.yml

@@ -7,7 +7,7 @@ environment:
     matrix:
         - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
           MINICONDA_DIRNAME: C:\Miniforge
-        - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
+        - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204
           OS: Linux
         - APPVEYOR_BUILD_WORKER_IMAGE: macOS
           OS: MacOSX

azure-pipelines.yml

@@ -18,7 +18,7 @@ parameters:
   - name: minor
     type: object
     default:
-      - 11
+      - 12
 
 jobs:
 - ${{ each minor in parameters.minor }}:

cadquery/assembly.py

@@ -467,7 +467,7 @@ def save(
         :param mode: STEP only - See :meth:`~cadquery.occ_impl.exporters.assembly.exportAssembly`.
         :param tolerance: the deflection tolerance, in model units. Only used for glTF, VRML. Default 0.1.
         :param angularTolerance: the angular tolerance, in radians. Only used for glTF, VRML. Default 0.1.
-        :param \**kwargs: Additional keyword arguments.  Only used for STEP, glTF and STL.
+        :param \\**kwargs: Additional keyword arguments.  Only used for STEP, glTF and STL.
             See :meth:`~cadquery.occ_impl.exporters.assembly.exportAssembly`.
         :param ascii: STL only - Sets whether or not STL export should be text or binary
         :type ascii: bool

conda/meta.yaml

@@ -12,12 +12,12 @@ build:
 
 requirements:
   build:
-    - python >=3.8
+    - python >=3.9
     - setuptools
   run:
-    - python >=3.8
-    - ocp 7.7.1
-    - occt 7.7.1
+    - python >=3.9
+    - ocp 7.7.2
+    - vtk=*=qt*
     - pyparsing >=2.1.9
     - ezdxf
     - ipython

environment.yml

@@ -2,14 +2,13 @@ name: cadquery
 channels:
   - conda-forge
 dependencies:
-  - python>=3.8
+  - python=3.12
   - ipython
-  - ocp=7.7.1
+  - ocp=7.7.2
+  - vtk=*=qt*
   - pyparsing>=2.1.9
   - sphinx=5.0.1
   - sphinx_rtd_theme
-  - black=19.10b0
-  - click=8.0.4
   - mypy
   - codecov
   - pytest
@@ -21,7 +20,12 @@ dependencies:
   - path
   - casadi
   - multimethod ==1.9.1
+  - typed-ast
+  - regex
+  - pathspec
+  - click
+  - appdirs
   - pip
   - pip:
     - --editable=.
-    - git+https://github.com/CadQuery/OCP-stubs.git
+    - git+https://github.com/cadquery/black.git@cq