Skip to content

Commit 7a65c61

Browse files
committed
Merge branch 'main' into release/0.3
2 parents 6f87d01 + 8c2f92b commit 7a65c61

File tree

7 files changed

+78
-10
lines changed

7 files changed

+78
-10
lines changed

.github/dependabot.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,25 @@ updates:
33
- package-ecosystem: "pip"
44
directory: "/"
55
schedule:
6-
interval: "daily"
6+
interval: "weekly"
77
assignees:
88
- "pyansys-ci-bot"
9+
commit-message:
10+
prefix: "MAINT"
11+
groups:
12+
pip-deps:
13+
patterns:
14+
- "*"
15+
16+
- package-ecosystem: "github-actions"
17+
directory: "/"
18+
schedule:
19+
interval: "weekly"
20+
assignees:
21+
- "pyansys-ci-bot"
22+
commit-message:
23+
prefix: "MAINT"
24+
groups:
25+
actions-deps:
26+
patterns:
27+
- "*"

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
name: Build package
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- name: Setup Python
23-
uses: actions/setup-python@v4
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: ${{ env.MAIN_PYTHON_VERSION }}
2626

@@ -48,7 +48,7 @@ jobs:
4848
python -c "from ansys.api.geometry import __version__; print(__version__)"
4949
5050
- name: Upload packages
51-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@v4
5252
with:
5353
name: ansys-api-geometry-packages
5454
path: dist/
@@ -61,11 +61,11 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Set up Python
64-
uses: actions/setup-python@v4
64+
uses: actions/setup-python@v5
6565
with:
6666
python-version: ${{ env.MAIN_PYTHON_VERSION }}
6767

68-
- uses: actions/download-artifact@v3
68+
- uses: actions/download-artifact@v4
6969

7070
- name: Display structure of downloaded files
7171
run: ls -R

ansys/api/geometry/v0/bodies.proto

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ service Bodies
6161
rpc IsEnclosureBody(ansys.api.dbu.v0.EntityIdentifier) returns (IsEnclosureBodyResponse);
6262

6363
rpc Rotate(RotateRequest) returns (google.protobuf.Empty);
64+
65+
rpc GetCollision(GetCollisionRequest) returns (GetCollisionResponse);
66+
6467
}
6568

6669
message RotateRequest {
@@ -184,4 +187,14 @@ message CopyRequest {
184187
string id=1;
185188
string parent=2;
186189
string name=3;
187-
}
190+
}
191+
192+
message GetCollisionRequest {
193+
string body_1_id=1;
194+
string body_2_id=2;
195+
}
196+
197+
message GetCollisionResponse {
198+
CollisionType collision=1;
199+
}
200+
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2023, ANSYS Inc. Unauthorized use, distribution or duplication is prohibited.
2+
syntax = "proto3";
3+
package ansys.api.geometry.v0.measuretools;
4+
5+
import "ansys/api/geometry/v0/models.proto";
6+
import "google/protobuf/struct.proto";
7+
import "google/protobuf/wrappers.proto";
8+
9+
option csharp_namespace = "Ansys.Api.Geometry.V0.MeasureTools";
10+
option go_package = "ansys/api/geometry/v0";
11+
12+
service MeasureTools{
13+
rpc MinDistanceBetweenObjects(MinDistanceBetweenObjectsRequest) returns (MinDistanceBetweenObjectsResponse);
14+
}
15+
16+
message MinDistanceBetweenObjectsRequest{
17+
repeated string bodies=1;
18+
}
19+
20+
message MinDistanceBetweenObjectsResponse{
21+
Gap gap=1;
22+
}

ansys/api/geometry/v0/models.proto

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ enum SurfaceType {
3030
SURFACETYPE_PROCEDURAL = 7;
3131
}
3232

33+
//
34+
// The type of collision.
35+
enum CollisionType {
36+
COLLISIONTYPE_NONE=0;
37+
COLLISIONTYPE_TOUCH=1;
38+
COLLISIONTYPE_INTERSECT=2;
39+
COLLISIONTYPE_CONTAINED=3;
40+
COLLISIONTYPE_CONTAINEDTOUCH=4;
41+
}
42+
3343
//
3444
// A design curve.
3545
message Curve{
@@ -508,4 +518,8 @@ message Surface {
508518
double minor_radius = 5;
509519
Direction reference = 6;
510520
Direction axis = 7;
511-
}
521+
}
522+
523+
message Gap {
524+
double distance = 1;
525+
}

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ requires = [
33
"setuptools >= 42.0.0",
44
"wheel",
55
"ansys_tools_protoc_helper>=0.4.0",
6-
"ansys-api-dbu==0.2.3",
6+
"ansys-api-dbu==0.2.4",
77
]
88
build-backend = "setuptools.build_meta:__legacy__"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
url=f"https://github.com/ansys/{package_name}",
4040
license="MIT",
4141
python_requires=">=3.7",
42-
install_requires=["grpcio~=1.47", "protobuf>=3.19,<5", "ansys-api-dbu==0.2.3"],
42+
install_requires=["grpcio~=1.47", "protobuf>=3.19,<5", "ansys-api-dbu==0.2.4"],
4343
packages=setuptools.find_namespace_packages(".", include=("ansys.*",)),
4444
package_data={
4545
"": ["*.proto", "*.pyi", "py.typed", "VERSION"],

0 commit comments

Comments
 (0)