Skip to content

Commit

Permalink
chore: merge remote-tracking branch 'origin/main' into feat/apdl_subm…
Browse files Browse the repository at this point in the history
…odule
  • Loading branch information
germa89 committed Dec 10, 2024
2 parents 19b6461 + 27c6ec9 commit 77c5683
Show file tree
Hide file tree
Showing 37 changed files with 369 additions and 222 deletions.
20 changes: 11 additions & 9 deletions .devcontainer/codespaces-dev/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
ansys-dpf-core==0.10.1
ansys-tools-visualization-interface==0.2.6
ansys-tools-visualization-interface==0.5.0
autopep8==2.3.1
matplotlib==3.9.0
pandas==2.2.2
pyansys-tools-report==0.7.3
matplotlib==3.9.2
pandas==2.2.3
pyansys-tools-report==0.8.1
pyfakefs==5.7.1
pyiges[full]==0.3.1
pytest-cov==5.0.0
pytest-cov==6.0.0
pytest-memprof<0.3.0
pytest-pyvista==0.1.9
pytest-rerunfailures==14.0
pytest==8.2.2
scipy==1.14.0
vtk==9.3.0
pytest-random-order==1.1.1
pytest-rerunfailures==15.0
pytest==8.3.3
scipy==1.14.1
vtk==9.3.1
31 changes: 16 additions & 15 deletions .devcontainer/codespaces-docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.53.0
ansys-mapdl-reader==0.54.2
ansys-sphinx-theme==0.16.6
ansys-tools-visualization-interface==0.2.6
grpcio==1.64.1
ansys-tools-visualization-interface==0.5.0
grpcio==1.68.0
imageio-ffmpeg==0.5.1
imageio==2.34.2
imageio==2.36.0
jupyter_sphinx==0.5.3
jupyterlab>=3.2.8
matplotlib==3.9.0
numpydoc==1.7.0
pandas==2.2.2
plotly==5.22.0
matplotlib==3.9.2
numpydoc==1.8.0
pandas==2.2.3
plotly==5.24.1
pyiges[full]==0.3.1
pypandoc==1.13
pypandoc==1.14
pytest-sphinx==0.6.3
pythreejs==2.4.2
sphinx-autobuild==2024.4.16
sphinx-autobuild==2024.10.3
sphinx-autodoc-typehints==1.25.2
sphinx-copybutton==0.5.2
sphinx-design==0.6.1
sphinx-gallery==0.16.0
sphinx-notfound-page==1.0.2
sphinx-gallery==0.18.0
sphinx-jinja==2.0.2
sphinx-notfound-page==1.0.4
sphinx-reredirects==0.1.4
sphinx==7.3.7
sphinxcontrib-websupport==1.2.7
sphinx==8.1.3
sphinxcontrib-websupport==2.0.0
sphinxemoji==0.3.1
vtk==9.3.0
vtk==9.3.1
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer-local/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Setting codespaces/development container
version: '3.3'
name: "PyMAPDL-Development" # this needs to be updated/unique if you want to have multiple containers
services:
pymapdldev:
restart: always
shm_size: '2gb' # Increase the shared memory directory
# to avoid running issues. By Default this is very small (64MB)
container_name: PyMAPDL-Development
shm_size: '2gb' # Increase the shared memory directory to avoid running issues. By Default this is very small (64MB)
container_name: "PyMAPDL-Development" # this needs to be updated/unique if you want to have multiple containers
mem_reservation: 8g
image: 'ghcr.io/ansys/mapdl:v24.1-ubuntu-student'
build:
Expand Down
43 changes: 23 additions & 20 deletions .devcontainer/devcontainer-local/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,38 @@
ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.53.0
ansys-sphinx-theme==0.16.6
ansys-tools-visualization-interface==0.2.6
ansys-mapdl-reader==0.54.2
ansys-sphinx-theme==1.2.2
ansys-tools-visualization-interface==0.5.0
autopep8==2.3.1
grpcio==1.64.1
grpcio==1.68.0
imageio-ffmpeg==0.5.1
imageio==2.34.2
imageio==2.36.0
jupyter_sphinx==0.5.3
jupyterlab>=3.2.8
matplotlib==3.9.0
numpydoc==1.7.0
pandas==2.2.2
plotly==5.22.0
pyansys-tools-report==0.7.3
matplotlib==3.9.2
numpydoc==1.8.0
pandas==2.2.3
plotly==5.24.1
pyansys-tools-report==0.8.1
pyfakefs==5.7.1
pyiges[full]==0.3.1
pypandoc==1.13
pytest-cov==5.0.0
pypandoc==1.14
pytest-cov==6.0.0
pytest-memprof<0.3.0
pytest-pyvista==0.1.9
pytest-rerunfailures==14.0
pytest-random-order==1.1.1
pytest-rerunfailures==15.0
pytest-sphinx==0.6.3
pytest==8.2.2
pytest==8.3.3
pythreejs==2.4.2
scipy==1.14.0
sphinx-autobuild==2024.4.16
scipy==1.14.1
sphinx-autobuild==2024.10.3
sphinx-autodoc-typehints==1.25.2
sphinx-copybutton==0.5.2
sphinx-design==0.6.1
sphinx-gallery==0.16.0
sphinx-notfound-page==1.0.2
sphinx-gallery==0.18.0
sphinx-jinja==2.0.2
sphinx-notfound-page==1.0.4
sphinx-reredirects==0.1.4
sphinx==7.3.7
sphinxcontrib-websupport==1.2.7
sphinx==8.1.3
sphinxcontrib-websupport==2.0.0
sphinxemoji==0.3.1
76 changes: 76 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL Advanced"

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
schedule:
- cron: '32 3 * * 2'

jobs:
analyze:
name: Analyze (${{ matrix.language }})
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners (GitHub.com only)
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
runs-on: 'ubuntu-latest'
permissions:
# required for all workflows
security-events: write

# required to fetch internal or private CodeQL packs
packages: read

# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
include:
- language: python
build-mode: none
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
# Use `c-cpp` to analyze code written in C, C++ or both
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@ repos:

# this validates our github workflow files
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.4
rev: 0.30.0
hooks:
- id: check-github-workflows
1 change: 1 addition & 0 deletions doc/changelog.d/3573.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
refactor: replace `get_ansys_path` with `get_mapdl_path`
1 change: 1 addition & 0 deletions doc/changelog.d/3580.documentation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docs: update docker instructions
1 change: 1 addition & 0 deletions doc/changelog.d/3582.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: components typo
1 change: 1 addition & 0 deletions doc/changelog.d/3584.documentation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docs: adding some info for getting multiple compose running
1 change: 1 addition & 0 deletions doc/changelog.d/3585.maintenance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ci: adding codeql.yml
1 change: 1 addition & 0 deletions doc/changelog.d/3589.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: linkchecker and cheatsheet links
1 change: 1 addition & 0 deletions doc/changelog.d/3590.miscellaneous.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat: improving load_array to reduce format line length
1 change: 1 addition & 0 deletions doc/changelog.d/3593.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump imageio from 2.36.0 to 2.36.1 in the documentation group
1 change: 1 addition & 0 deletions doc/changelog.d/3599.maintenance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ci: pre-commit autoupdate
1 change: 1 addition & 0 deletions doc/changelog.d/3608.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: avoid verbose grpc interface when solving
10 changes: 6 additions & 4 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
with open("links.rst") as f:
rst_epilog += f.read()

rst_epilog = rst_epilog.replace("%%VERSION%%", "v231")
rst_epilog = rst_epilog.replace("%%VERSION%%", "v242")
rst_epilog = rst_epilog.replace("%%PYMAPDLVERSION%%", release)


Expand All @@ -219,8 +219,10 @@
linkcheck_ignore = [
"https://github.com/ansys/pymapdl/*",
"https://mapdl.docs.pyansys.com/*",
"https://ansysaccount.b2clogin.com/*", # behind payfirewall
"https://ansyshelp.ansys.com/*", # behind payfirewall
"https://www.ansys.com/*", # behind firewall
"https://download.ansys.com/*", # behind firewall
"https://ansysaccount.b2clogin.com/*", # behind authentication
"https://ansyshelp.ansys.com/*", # behind authentication
"https://forum.ansys.com/forums/*", # It is detected as broken
"https://courses.ansys.com/*", # It is detected as broken
]
Expand All @@ -239,7 +241,7 @@
f"https://github.com/ansys/pymapdl/releases/tag/v{__version__}"
)

user_agent = """curl https://www.ansys.com -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.3"""
user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 Edg/123.0.2420.81" # noqa: E501

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = "sphinx"
Expand Down
2 changes: 1 addition & 1 deletion doc/source/getting_started/learning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Downloads

.. jinja:: cheat_sheet

- View and download :download:`PyMAPDL cheatsheet <https://mapdl.docs.ansys.com/version/{{ version }}/_static/cheatsheet.pdf>`
- View and download :download:`PyMAPDL cheatsheet <https://github.com/ansys/pymapdl/blob/gh-pages/version/{{ version }}/_static/cheat_sheet.pdf>`
to help you to learn PyMAPDL.

- Visit :ref:`ref_examples` to learn how PyMAPDL can be used to solve different real problems.
Expand Down
5 changes: 3 additions & 2 deletions doc/source/getting_started/project.rst
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,9 @@ In the upper right corner of the documentation's title bar, there is an option f
viewing the documentation for the latest stable release to viewing the documentation for the
development version or previously released versions.

You can also `download <pymapdl_cheat_sheet>`_ the PyMAPDL cheat sheet. This one-page reference provides
syntax rules and commands for using PyMAPDL.
You can also download the
:download:`PyMAPDL cheat sheet <https://github.com/ansys/pymapdl/blob/gh-pages/version/{{ version }}/_static/cheat_sheet.pdf>`.
This one-page reference provides syntax rules and commands for using PyMAPDL.

On the `PyMAPDL Issues <https://github.com/ansys/pymapdl/issues>`_ page,
you can create issues to report bugs and request new features. On the `PyMAPDL Discussions
Expand Down
1 change: 1 addition & 0 deletions doc/source/links.rst
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
.. _lmod_docs: https://lmod.readthedocs.io/en/latest/
.. _pygad_docs: https://pygad.readthedocs.io/en/latest/
.. _ga_article: https://blog.derlin.ch/genetic-algorithms-with-pygad
.. _simutech_linux_dependencies: https://install.simutechgroup.com/info-required-linux-packages-and-libraries


.. #Github links:
Expand Down
2 changes: 1 addition & 1 deletion doc/source/user_guide/components.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Set a component without specifying the type, by default it is ``NODE``:
>>> mapdl.components["mycomp4"] = (1, 2, 3)
/Users/german.ayuso/pymapdl/src/ansys/mapdl/core/component.py:347: UserWarning: Assuming a KP selection.
It is recommended you use the following notation to avoid this warning:
> mapdl.components['mycomp4'] = 'KP' (1, 2, 3)
> mapdl.components['mycomp4'] = 'KP', (1, 2, 3)
Alternatively, you disable this warning using:
> mapdl.components.default_entity_warning=False
warnings.warn(
Expand Down
2 changes: 2 additions & 0 deletions doc/source/user_guide/troubleshoot.rst
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ dependencies.
libxp6
An useful resource is `HOW TO - Install Ansys' Required Linux Packages & Libraries <simutech_linux_dependencies_>`_.

.. _conflicts_student_version:

Conflicts with student version
Expand Down
Loading

0 comments on commit 77c5683

Please sign in to comment.