Skip to content

Commit 959d1d0

Browse files
committed
Update
2 parents 1ea37ae + cf099e4 commit 959d1d0

File tree

101 files changed

+9105
-830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+9105
-830
lines changed

.github/workflows/ci.yml

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- '*no-ci*'
88
push:
99
branches:
10-
- master
10+
- main
1111
workflow_dispatch:
1212
inputs:
1313
ansys_version:
@@ -120,7 +120,7 @@ jobs:
120120
wheelhouse: false
121121
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
122122
test_any: ${{ matrix.test-any }}
123-
DOCSTRING: ${{ !matrix.test-any }}
123+
DOCSTRING: ${{ matrix.test-any == 'false' }}
124124
secrets: inherit
125125

126126
docker_tests:
@@ -148,7 +148,7 @@ jobs:
148148
if: |
149149
github.event.action != 'closed' &&
150150
(github.event.action != 'labeled' || github.event.label.name == 'deploy-pr-doc') &&
151-
(startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft)
151+
(startsWith(github.head_ref, 'main') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft)
152152
uses: ./.github/workflows/docs.yml
153153
needs: pick_server_suffix
154154
with:
@@ -183,7 +183,7 @@ jobs:
183183
if: |
184184
github.event.action != 'closed' &&
185185
(github.event.action != 'labeled' || github.event.label.name == 'deploy-pr-doc') &&
186-
(github.ref == 'refs/heads/master' && github.event_name == 'push')
186+
(github.ref == 'refs/heads/main' && github.event_name == 'push')
187187
needs: [docs]
188188
steps:
189189
- name: "Upload development documentation"
@@ -200,7 +200,7 @@ jobs:
200200
if: |
201201
github.event.action != 'closed' &&
202202
(github.event.action != 'labeled' || github.event.label.name == 'deploy-pr-doc') &&
203-
(startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft)
203+
(startsWith(github.head_ref, 'main') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft)
204204
uses: ./.github/workflows/examples.yml
205205
needs: pick_server_suffix
206206
with:
@@ -214,12 +214,12 @@ jobs:
214214
if: |
215215
github.event.action != 'closed' &&
216216
(github.event.action != 'labeled' || github.event.label.name == 'deploy-pr-doc') &&
217-
(startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft)
217+
(startsWith(github.head_ref, 'main') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft)
218218
uses: ./.github/workflows/pydpf-post.yml
219219
needs: pick_server_suffix
220220
with:
221221
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
222-
post_branch: "master"
222+
post_branch: "main"
223223
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
224224
test_docstrings: "true"
225225
secrets: inherit
@@ -229,7 +229,7 @@ jobs:
229229
if: |
230230
github.event.action != 'closed' &&
231231
(github.event.action != 'labeled' || github.event.label.name == 'deploy-pr-doc') &&
232-
(startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft)
232+
(startsWith(github.head_ref, 'main') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft)
233233
strategy:
234234
fail-fast: false
235235
matrix:
@@ -248,3 +248,39 @@ jobs:
248248
DOCSTRING: false
249249
standalone_suffix: ${{ matrix.dpf.standalone-suffix }}
250250
secrets: inherit
251+
252+
sync-main-with-master:
253+
name: "Sync main with master"
254+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
255+
runs-on: ubuntu-latest
256+
steps:
257+
- name: "Install Git and clone project"
258+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
259+
with:
260+
token: ${{ secrets.MIGRATION_PAT }}
261+
fetch-depth: 0
262+
263+
- name: "Verify that main is the default branch"
264+
shell: bash
265+
run: |
266+
head_branch=$(git remote show origin | grep "HEAD branch:")
267+
main_branch=${head_branch#*: }
268+
269+
if [[ $main_branch != "main" ]]; then
270+
echo "The default branch is not 'main'. It is set to '$main_branch'."
271+
echo "Please set 'main' as the default branch in the repository settings."
272+
exit 1
273+
fi
274+
275+
- name: "Configure git username and email"
276+
shell: bash
277+
run: |
278+
git config --global user.name "${{ secrets.PYANSYS_CI_BOT_USERNAME }}"
279+
git config --global user.email "${{ secrets.PYANSYS_CI_BOT_EMAIL }}"
280+
281+
- name: "Sync main to master"
282+
shell: bash
283+
run: |
284+
git checkout master
285+
git reset --hard main
286+
git push

.github/workflows/update_operators.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
branch: maint/update_code_for_${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
137137
labels: server-sync
138138
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
139-
reviewers: ${{ github.ref_name == 'master' && 'ansys/dpf_integration_proxies' || '' }}
139+
reviewers: ${{ github.ref_name == 'main' && 'ansys/dpf_integration_proxies' || '' }}
140140

141141
- name: "Kill all servers"
142142
uses: ansys/pydpf-actions/[email protected]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![docs](https://img.shields.io/website?down_color=lightgrey&down_message=invalid&label=documentation&up_color=brightgreen&up_message=up&url=https%3A%2F%2Fdpfdocs.pyansys.com%2F)](https://dpfdocs.pyansys.com)
88
[![MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
99
[![pypidl](https://img.shields.io/pypi/dm/ansys-dpf-core.svg?label=PyPI%20downloads)](https://pypi.org/project/ansys-dpf-core/)
10-
[![cov](https://codecov.io/gh/ansys/pydpf-core/branch/master/graph/badge.svg)](https://codecov.io/gh/ansys/pydpf-core)
10+
[![cov](https://codecov.io/gh/ansys/pydpf-core/branch/main/graph/badge.svg)](https://codecov.io/gh/ansys/pydpf-core)
1111
[![codacy](https://app.codacy.com/project/badge/Grade/61b6a519aea64715ad1726b3955fcf98)](https://www.codacy.com/gh/ansys/pydpf-core/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ansys/pydpf-core&utm_campaign=Badge_Grade)
1212

1313
Ansys Data Processing Framework (DPF) provides numerical simulation
@@ -187,7 +187,7 @@ module. It closes when you exit Python or connect to a different server.
187187
## License and acknowledgments
188188

189189
PyDPF-Core is licensed under the MIT license. For more information, see the
190-
[LICENSE](https://github.com/ansys/pydpf-post/raw/master/LICENSE) file.
190+
[LICENSE](https://github.com/ansys/pydpf-post/raw/main/LICENSE) file.
191191

192192
PyDPF-Core makes no commercial claim over Ansys whatsoever. This library
193193
extends the functionality of Ansys DPF by adding a Python interface

doc/source/_static/custom.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,16 @@
22
.wy-table-responsive table td, .wy-table-responsive table th {
33
white-space: normal;
44
}
5+
/* Check https://www.w3schools.com/cssref/css_colors.php for colors */
6+
/* Ansys gold for MAPDL with black text*/
7+
.sd-bg-mapdl{background-color: #FFB71B}
8+
.sd-bg-text-mapdl{color: Black}
9+
/* Ansys orange accent color for Fluent with black text*/
10+
.sd-bg-lsdyna{background-color: #FB471F}
11+
.sd-bg-text-lsdyna{color: Black}
12+
/* Ansys blue accent color #00629F for Fluent with black text*/
13+
.sd-bg-fluent{background-color: #0081D0}
14+
.sd-bg-text-fluent{color: Black}
15+
.sd-bg-cfx{background-color: LightSeaGreen}
16+
.sd-bg-text-cfx{color: Black}
17+
.sd-hide-link-text{height: 0}

0 commit comments

Comments
 (0)