Merge branch 'main' of https://github.com/compas-dev/compas_occ

compas-dev · Jul 29, 2024 · 584489c · 584489c
2 parents e2c9a8b + 7ae07ca
commit 584489c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+### Removed
+
+
+## [1.2.1] 2024-07-11
+
+### Added
+
+### Changed
+
 * Changed `brepgprop_VolumeProperties` to `brepgprop.VolumeProperties`.
+* Pined `pythonocc-core` to `< 7.8` to avoid qt conflict with Pyside6.
 
 ### Removed
 

diff --git a/environment.yml b/environment.yml
@@ -2,7 +2,7 @@ name: occ
 channels:
  - conda-forge
 dependencies:
- - pythonocc-core
+ - pythonocc-core < 7.8
  - pip:
  - -r requirements.txt
  - -r requirements-dev.txt

diff --git a/pyproject.toml b/pyproject.toml
@@ -74,7 +74,7 @@ doctest_optionflags = [
 # ============================================================================
 
 [tool.bumpversion]
-current_version = "1.2.0"
+current_version = "1.2.1"
 message = "Bump version to {new_version}"
 commit = true
 tag = true

diff --git a/src/compas_occ/__init__.py b/src/compas_occ/__init__.py
@@ -4,7 +4,7 @@
 __copyright__ = "Block Research Group - ETH Zurich"
 __license__ = "MIT License"
 __email__ = "[email protected]"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 
 HERE = os.path.dirname(__file__)