Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4b1cd9a
Start with OCP8
adam-urbanczyk Jul 31, 2026
9c7d3af
Merge branch 'master' into adam-ocp8
adam-urbanczyk Aug 12, 2026
4470100
Initial pass
adam-urbanczyk Aug 14, 2026
017a017
Change to OCP.collections submodule
adam-urbanczyk Aug 20, 2026
a093172
Black fix
adam-urbanczyk Aug 20, 2026
f242907
Fix typos in collection names
adam-urbanczyk Aug 20, 2026
f1995fb
Residual fixes
adam-urbanczyk Aug 22, 2026
faec3c1
Mypy fixes
adam-urbanczyk Aug 22, 2026
1c0ce50
Back to original annotation
adam-urbanczyk Aug 22, 2026
72b600d
Another take
adam-urbanczyk Aug 22, 2026
fff591f
One revert too many
adam-urbanczyk Aug 22, 2026
1d25fde
BndBox inner class workaround
adam-urbanczyk Aug 24, 2026
30ad6ab
Fix simple test failures
adam-urbanczyk Aug 26, 2026
f0238f0
Mac test fix
adam-urbanczyk Aug 27, 2026
38014d7
Move back to conda-forge
adam-urbanczyk Aug 28, 2026
a2236d4
Remove params
adam-urbanczyk Aug 28, 2026
c2c823e
Back to using operators
adam-urbanczyk Aug 29, 2026
ba29f39
Update env to 8.0.0.1
adam-urbanczyk Aug 29, 2026
aa9457c
Update meta.yaml to 8.0.0.1
adam-urbanczyk Aug 29, 2026
30d58e9
Trigger CI
adam-urbanczyk Aug 30, 2026
14435ac
Merge branch 'adam-ocp8' of https://github.com/CadQuery/cadquery into…
adam-urbanczyk Aug 30, 2026
26c047b
Update cadquery/occ_impl/geom.py
adam-urbanczyk Aug 31, 2026
5aeb138
Add a test
adam-urbanczyk Aug 31, 2026
ea74790
Fix test
adam-urbanczyk Aug 31, 2026
8f5e7b9
Mac fix
adam-urbanczyk Aug 31, 2026
65593f1
Pin ocp to 8.0.0 in setup
adam-urbanczyk Sep 4, 2026
a90fca3
Start with 8.0.1
adam-urbanczyk Sep 4, 2026
3b710c3
Merge branch 'master' into adam-ocp801
adam-urbanczyk Sep 4, 2026
dcb770a
Merge branch 'master' into adam-ocp801
adam-urbanczyk Sep 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ requirements:
- setuptools
run:
- python >=3.11
- ocp=8.0.0.1
- ocp=8.0.1.0
- pyparsing >=3.0.0
- ezdxf>=1.3.0
- ipython
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ channels:
dependencies:
- python>=3.11
- ipython
# - cadquery/label/dev::ocp=8.0.0.1
- ocp=8.0.0.1
# - cadquery/label/dev::ocp=8.0.1.0
- ocp=8.0.1.0
- pyparsing>=3.0.0
- sphinx=9.1.0
# - sphinx_rtd_theme=3.1.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# Only include the installation dependencies if we are not running on RTD or AppVeyor or in a conda env
if not is_rtd and not is_appveyor and not is_azure and not is_conda:
reqs = [
"cadquery-ocp==8.0.0.*",
"cadquery-ocp==8.0.1.*",
"ezdxf>=1.3.0",
"multimethod>=2.1,<3.0",
"nlopt>=2.9.0,<3.0",
Expand Down