Skip to content

Commit 5b151ff

Browse files
adam-urbanczykadam-urbanczyk
andauthored
OCP 7.9.3 (#190)
* Adding 7.9 * Update config * Update env * Start reworking cmakelists * Update CI * Back to 2 jobs by default * Use newer ubuntu * conda run iso mamba run * Roll back to 1.5 * Use python 3.12 in the base env * Update 2nd conda-enable * Add some exclusions * Update pywrap * Update pywrap * Update pywrap * Add extra includes to fix compilation errors * Update pywrap * Add some missing headers * Extra exclude * Update pywrap * Use newer image * Use newer python * Use clang 20 * Trying to resolve the env * Even newer image * Update msvc location * Use one core on win * Update meta.yaml * Update pywrap * Build out of tree * Generete in the current dir for now * Update occt version in meta.yaml * Update pywrap * Try installing g++-13 * Try nostdinc++ on linux * Remove mesa-libgl-devel-cos6-x86_64 * Revert additional flags on linux * Use cxx-compiler also on win * Pipeline cleanup * Use stock stubgen * Use stock stubgen * Fix the pybind11_stubgen call * Rename local stub dir * Back to 2019 * Newer python * Try with win-latest * Update pywrap * Add other smart ptr names * Update pywrap * Exclude ns via configuration * More ns exlucdes * Typo fix * Switch to micromamba * Use micromamba everywhere * Replace more conda occurances * Use correct options * Fix additional mamba invocations * Swtich to compilation in bash on windows * Explicit micromamba init for win compilation * Preparing for x-generation * Try x-generating for win * Fix name * Typo fix * Fix dir * Try to fix platform handling * Use own windows.h * Update pywrap * Be more verbose * Always use extern/include * Compile in an env explicitely * Back to pwsh * Use cmake -E on win * Update pywrap * Go back to windows for generation * Pull parts of MSVC and WinSDK when x-generating * Update pywrap * Tweak CMakeLists * Adding vsdownload * Tweak various conditions checks * Add msitools for linux * Try x-generation * Change OCCT dll path * Use the variable correctly * Another CMake var usage fix * CMakeLists cleanup * Fix paths/targets * Find OpenGL * CI cleanup * Cleanup * Add explicit RapidJSON include * Switch to 7.9.2 * Update pywrap * Update pywrap * Update pywrap * Update pywrap * Update pywrap * Update pywrap * Update pywrap * Update pywrap * Update pywrap * Move to 7.9.3 * Use clang 21 * Back to pybind11 2.13 * Update meta.yaml --------- Co-authored-by: adam-urbanczyk <13981538+adam-urbanczyk@users.noreply.github.com> Co-authored-by: adam-urbanczyk <adamj@79LABS> Co-authored-by: AU <AU@>
1 parent de94027 commit 5b151ff

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

conda/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set OCCT_VER = "7.9.2" %}
1+
{% set OCCT_VER = "7.9.3" %}
22
{% set OCP_TWEAK = "0" %}
33

44
package:

environment.devenv.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: cpp-py-bindgen
22
channels:
33
- conda-forge
44
dependencies:
5-
- occt=7.9.2=all*
5+
- occt=7.9.3=all*
66
- pybind11=2.13.*
77
- python={{ get_env("PYTHON_VERSION", default="3.13") }}
88
- cmake >3.24
99
- ninja
1010
{% if get_env("STAGE", default="generate") == "generate" %}
1111
- clangdev
12-
- python-clang=20.*
12+
- python-clang=21.*
1313
- joblib
1414
- toml
1515
- click

ocp.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ class Adaptor3d_Surface;
424424

425425
[Attributes]
426426

427-
__version__ = "7.9.2.0"
427+
__version__ = "7.9.3.0"
428428

429429
[Modules]
430430

opencascade/Geom2dAdaptor_Curve.hxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <GeomAbs_CurveType.hxx>
2525
#include <GeomAbs_Shape.hxx>
2626
#include <gp_Pnt2d.hxx>
27+
#include <Precision.hxx>
2728
#include <Standard_NullObject.hxx>
2829
#include <TColStd_Array1OfReal.hxx>
2930

@@ -71,7 +72,7 @@ public:
7172
load(theCurve, theCurve->FirstParameter(), theCurve->LastParameter());
7273
}
7374

74-
//! Standard_ConstructionError is raised if theUFirst>theULast
75+
//! Standard_ConstructionError is raised if theUFirst > theULast + Precision::PConfusion()
7576
void Load(const Handle(Geom2d_Curve)& theCurve,
7677
const Standard_Real theUFirst,
7778
const Standard_Real theULast)
@@ -80,7 +81,7 @@ public:
8081
{
8182
throw Standard_NullObject();
8283
}
83-
if (theUFirst > theULast)
84+
if (theUFirst > theULast + Precision::Confusion())
8485
{
8586
throw Standard_ConstructionError();
8687
}

opencascade/GeomAdaptor_Curve.hxx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <Geom_Curve.hxx>
2323
#include <GeomAbs_Shape.hxx>
2424
#include <GeomEvaluator_Curve.hxx>
25+
#include <Precision.hxx>
2526
#include <Standard_NullObject.hxx>
2627
#include <Standard_ConstructionError.hxx>
2728

@@ -47,7 +48,7 @@ public:
4748

4849
GeomAdaptor_Curve(const Handle(Geom_Curve)& theCurve) { Load(theCurve); }
4950

50-
//! Standard_ConstructionError is raised if theUFirst>theULast
51+
//! Standard_ConstructionError is raised if theUFirst > theULast + Precision::PConfusion()
5152
GeomAdaptor_Curve(const Handle(Geom_Curve)& theCurve,
5253
const Standard_Real theUFirst,
5354
const Standard_Real theULast)
@@ -70,7 +71,7 @@ public:
7071
load(theCurve, theCurve->FirstParameter(), theCurve->LastParameter());
7172
}
7273

73-
//! Standard_ConstructionError is raised if theUFirst>theULast
74+
//! Standard_ConstructionError is raised if theUFirst > theULast + Precision::PConfusion()
7475
void Load(const Handle(Geom_Curve)& theCurve,
7576
const Standard_Real theUFirst,
7677
const Standard_Real theULast)
@@ -79,7 +80,7 @@ public:
7980
{
8081
throw Standard_NullObject();
8182
}
82-
if (theUFirst > theULast)
83+
if (theUFirst > theULast + Precision::Confusion())
8384
{
8485
throw Standard_ConstructionError();
8586
}

opencascade/Standard_Version.hxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Created on: 2025-11-04
1+
// Created on: 2025-12-24
22
// Copyright (c) 2002-2025 OPEN CASCADE SAS
33
//
44
// This file is part of Open CASCADE Technology software library.
@@ -38,7 +38,7 @@ major, minor, and patch number
3838
// Primary definitions
3939
#define OCC_VERSION_MAJOR 7
4040
#define OCC_VERSION_MINOR 9
41-
#define OCC_VERSION_MAINTENANCE 2
41+
#define OCC_VERSION_MAINTENANCE 3
4242

4343
//! This macro must be commented in official release, and set to non-empty
4444
//! string in other situations, to identify specifics of the version, e.g.:
@@ -50,7 +50,7 @@ major, minor, and patch number
5050
// Derived (manually): version as real and string (major.minor)
5151
#define OCC_VERSION 7.9
5252
#define OCC_VERSION_STRING "7.9"
53-
#define OCC_VERSION_COMPLETE "7.9.2"
53+
#define OCC_VERSION_COMPLETE "7.9.3"
5454

5555
//! Derived: extended version as string ("major.minor.maintenance.dev")
5656
#ifdef OCC_VERSION_DEVELOPMENT

0 commit comments

Comments
 (0)