Skip to content

Commit

Permalink
Merge branch 'main' into release/0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
maxcapodi78 authored and maxcapodi78 committed Oct 15, 2022
2 parents 6e84812 + c238535 commit 2043387
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
application_private_key: ${{ secrets.BOT_APPLICATION_PRIVATE_KEY }}

- name: Deploy
uses: JamesIves/[email protected].0
uses: JamesIves/[email protected].1
with:
repository-name: pyansys/devportal-doc-archive
branch: drupal
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
retention-days: 7

- name: Deploy
uses: JamesIves/[email protected].0
uses: JamesIves/[email protected].1
with:
repository-name: pyansys/pyaedt-dev-docs
branch: gh-pages
Expand Down
7 changes: 6 additions & 1 deletion pyaedt/application/Design.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,12 @@ def load_aedt_thread(path):
logger.info("AEDT file load (threaded) time: {}".format(time.time() - start))

t = None
if project_name and os.path.exists(project_name) and os.path.splitext(project_name)[1] == ".aedt":
if (
not is_ironpython
and project_name
and os.path.exists(project_name)
and os.path.splitext(project_name)[1] == ".aedt"
):
t = threading.Thread(target=load_aedt_thread, args=(project_name,))
t.start()
self._init_variables()
Expand Down

0 comments on commit 2043387

Please sign in to comment.