Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update the tox.ini to different tox env #3164

Draft
wants to merge 39 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
74dda02
fix: update the codestyle
Revathyvenugopal162 Jun 10, 2024
c47f466
fix: update vale
Revathyvenugopal162 Jun 10, 2024
a5e4be0
docs: add build env variable
Revathyvenugopal162 Jun 10, 2024
1c61a30
fix: add link check tox env
Revathyvenugopal162 Jun 10, 2024
e514d99
Merge branch 'main' into fix/improve-tox
Revathyvenugopal162 Jun 10, 2024
7706b24
fix: add the docker run env
Revathyvenugopal162 Jun 10, 2024
56cabe5
fix: add the docker run env
Revathyvenugopal162 Jun 10, 2024
97667f7
Update doc/source/conf.py
Revathyvenugopal162 Jun 11, 2024
514a371
feat: apply suggestions from @jorgepiloto
Revathyvenugopal162 Jun 11, 2024
c5f9697
Merge branch 'fix/improve-tox' of https://github.com/ansys/pymapdl in…
Revathyvenugopal162 Jun 11, 2024
2a40945
feat: apply suggestions from @jorgepiloto
Revathyvenugopal162 Jun 11, 2024
2bae4dd
docs: rearrange sphinx conf
Revathyvenugopal162 Jun 11, 2024
1d2585f
docs: rearrange the crads with index
Revathyvenugopal162 Jun 11, 2024
1ddd1e6
docs: add jinja conditions to pymapdl
Revathyvenugopal162 Jun 11, 2024
e9e01f5
fix: update the tox file
Revathyvenugopal162 Jun 11, 2024
1c00997
fix: ref links
Revathyvenugopal162 Jun 11, 2024
24fa784
fix: wnv variable for docs
Revathyvenugopal162 Jun 12, 2024
58aaebb
fix: fix docker file
Revathyvenugopal162 Jun 17, 2024
f96b7b6
fix: ansys version on docker file
Revathyvenugopal162 Jun 18, 2024
981f269
fix: ansys license server
Revathyvenugopal162 Jun 18, 2024
dca0d42
fix: add docker compose and tox docker buid commands
Revathyvenugopal162 Jun 18, 2024
edb007c
fix: add tox docker buid commands
Revathyvenugopal162 Jun 18, 2024
cf41c39
Merge branch 'main' into fix/improve-tox
Revathyvenugopal162 Jun 18, 2024
b707026
Adding changelog entry: 3164.miscellaneous.md
pyansys-ci-bot Jun 18, 2024
ad8e462
fix: add tox docker buid commands
Revathyvenugopal162 Jun 18, 2024
d3e70d2
Merge branch 'fix/improve-tox' of https://github.com/ansys/pymapdl in…
Revathyvenugopal162 Jun 18, 2024
9037c89
fix: add tox docker buid commands
Revathyvenugopal162 Jun 19, 2024
bf0bb9d
Adding changelog entry: 3164.fixed.md
pyansys-ci-bot Jun 19, 2024
c82d9e0
Merge branch 'main' into fix/improve-tox
Revathyvenugopal162 Jun 19, 2024
cdbde4b
Merge branch 'main' into fix/improve-tox
Revathyvenugopal162 Aug 23, 2024
8159e5d
Update the image cache
Revathyvenugopal162 Aug 23, 2024
1adab82
Merge branch 'main' into fix/improve-tox
germa89 Aug 27, 2024
51f6d5e
Merge branch 'main' into fix/improve-tox
Revathyvenugopal162 Oct 7, 2024
e2a3f45
Merge branch 'main' into fix/improve-tox
Revathyvenugopal162 Oct 7, 2024
2265269
fix: remove the comments
Revathyvenugopal162 Oct 7, 2024
801800f
Merge branch 'fix/improve-tox' of https://github.com/ansys/pymapdl in…
Revathyvenugopal162 Oct 7, 2024
f167caf
Merge branch 'main' into fix/improve-tox
Revathyvenugopal162 Oct 7, 2024
cd5998e
Merge branch 'main' into fix/improve-tox
germa89 Oct 25, 2024
6b1094e
Merge branch 'main' into fix/improve-tox
germa89 Nov 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,7 @@ doc/source/sg_execution_times.rst
*prin-stresses.html
doc/webserver.log
doc/webserver.pid


# Ignore any distributions directory to prevent accidental publications
distributions/
1 change: 1 addition & 0 deletions doc/changelog.d/3164.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: Update the tox.ini to different tox env
76 changes: 46 additions & 30 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@
"sphinx.ext.extlinks",
"sphinx.ext.intersphinx",
"sphinx_autodoc_typehints",
"sphinx_jinja",
"sphinx_design",
"sphinx_jinja",
"sphinx_copybutton",
"sphinx_gallery.gen_gallery",
"sphinxemoji.sphinxemoji",
"sphinx.ext.graphviz",
"ansys_sphinx_theme.extension.linkcode",
Expand All @@ -120,7 +120,7 @@
"ansys-tools-path": ("https://path.tools.docs.pyansys.com/version/stable/", None),
}

suppress_warnings = ["label.*", "design.fa-build", "config.cache"]
suppress_warnings = ["label.*", "design.fa-build", "config.cache", "design.grid"]
sd_fontawesome_latex = True

# Graphviz diagrams configuration
Expand Down Expand Up @@ -198,6 +198,49 @@
"substitutions.rst",
]

BUILD_API = True if os.environ.get("BUILD_API", "true") == "true" else False
if not BUILD_API:
exclude_patterns.extend(["api/**", "mapdl_commands/**"])

BUILD_EXAMPLES = True if os.environ.get("BUILD_EXAMPLES", "true") == "true" else False
if not BUILD_EXAMPLES:
exclude_patterns.extend(["examples/index.rst", "examples/**", "examples/**/**"])
suppress_warnings.append("ref.*")
else:
extensions.append("sphinx_gallery.gen_gallery")
Revathyvenugopal162 marked this conversation as resolved.
Show resolved Hide resolved
# -- Sphinx Gallery Options ---------------------------------------------------
sphinx_gallery_conf = {
# convert rst to md for ipynb
"pypandoc": True,
# path to your examples scripts
"examples_dirs": [EXAMPLES_PATH_FOR_DOCS],
# path where to save gallery generated examples
"gallery_dirs": [GALLERY_EXAMPLES_PATH],
# Pattern to search for example files
"filename_pattern": r"\." + DEFAULT_EXAMPLE_EXTENSION,
# Remove the "Download all examples" button from the top level gallery
"download_all_examples": False,
# Sort gallery example by file name instead of number of lines (default)
"within_subsection_order": FileNameSortKey,
# directory where function granular galleries are stored
"backreferences_dir": None,
# Modules for which function level galleries are created. In
"doc_module": "ansys-mapdl-core",
"image_scrapers": ("pyvista", "matplotlib"),
"ignore_pattern": "flycheck*",
"thumbnail_size": (350, 350),
"remove_config_comments": True,
"default_thumb_file": pyansys_light_mode_logo,
"show_signature": False,
}

jinja_contexts = {
"main_toctree": {
"build_api": BUILD_API,
"build_examples": BUILD_EXAMPLES,
},
}

# make rst_epilog a variable, so you can add other epilog parts to it
rst_epilog = ""

Expand All @@ -213,6 +256,7 @@
with open("substitutions.rst") as f:
rst_epilog += f.read()


# Broken anchors:
linkcheck_exclude_documents = ["index", "changelog"]
linkcheck_anchors_ignore_for_url = ["https://docs.pyvista.org/api/*"]
Expand Down Expand Up @@ -252,34 +296,6 @@
copybutton_prompt_text = r">>> ?|\.\.\. "
copybutton_prompt_is_regexp = True

# -- Sphinx Gallery Options ---------------------------------------------------
sphinx_gallery_conf = {
# convert rst to md for ipynb
"pypandoc": True,
# path to your examples scripts
"examples_dirs": [EXAMPLES_PATH_FOR_DOCS],
# path where to save gallery generated examples
"gallery_dirs": [GALLERY_EXAMPLES_PATH],
# Pattern to search for example files
"filename_pattern": r"\." + DEFAULT_EXAMPLE_EXTENSION,
# Remove the "Download all examples" button from the top level gallery
"download_all_examples": False,
# Sort gallery example by file name instead of number of lines (default)
"within_subsection_order": FileNameSortKey,
# directory where function granular galleries are stored
"backreferences_dir": None,
# Modules for which function level galleries are created. In
"doc_module": "ansys-mapdl-core",
"image_scrapers": ("pyvista", "matplotlib"),
"ignore_pattern": "flycheck*",
"thumbnail_size": (350, 350),
"remove_config_comments": True,
"default_thumb_file": pyansys_light_mode_logo,
"show_signature": False,
}
# ---


# -- Options for HTML output -------------------------------------------------
html_short_title = html_title = "PyMAPDL"
html_theme = "ansys_sphinx_theme"
Expand Down
2 changes: 1 addition & 1 deletion doc/source/getting_started/devcontainer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Develop on a remote container
The Docker image listed in the
`repository development container configuration files <pymapdl_devcontainer_configuration_>`_
is not for public use due to licensing issues.
However, you can `create your own Docker image <ref_make_container_>`
However, you can `create your own Docker image <ref_make_container>`_
and use this file as a template for setting your own local development container.

To use a `remote container <vscode_devcontainers_containers_>`_, you must install this software:
Expand Down
44 changes: 26 additions & 18 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,22 @@
:keywords: pymapdl, mapdl, simulation, finite elements, python
:description: Welcome to PyMAPDL documentation.


.. toctree::
:hidden:
:maxdepth: 3

getting_started/index
user_guide/index
mapdl_commands/index
api/index
examples/index
changelog

.. jinja:: main_toctree
Revathyvenugopal162 marked this conversation as resolved.
Show resolved Hide resolved

.. toctree::
:hidden:
:maxdepth: 3

getting_started/index
user_guide/index
{% if build_api %}
mapdl_commands/index
api/index
{% endif %}
{% if build_examples %}
examples/index
{% endif %}
changelog

.. image:: ../source/_static/logo_dark.png
:class: only-dark
Expand Down Expand Up @@ -74,13 +78,17 @@
Check our :ref:`ref_getting_started` section to learn to
install MAPDL, install PyMAPDL or launch PyMAPDL.

.. grid-item-card:: :fa:`gears` See some PyMAPDL usage examples
:link: ref_examples
:link-type: ref
.. jinja:: main_toctree

{% if build_examples %}
.. grid-item-card:: :fa:`gears` See some PyMAPDL usage examples
:link: ref_examples
:link-type: ref

In our :ref:`ref_examples` section, you
can find a great collection of PyMAPDL
user cases.
In our :ref:`ref_examples` section, you
can find a great collection of PyMAPDL
user cases..
{% endif %}

.. grid-item-card:: :fa:`book-open-reader` Use the different library modules
:link: ref_user_guide
Expand Down
98 changes: 0 additions & 98 deletions docker/Dockerfile

This file was deleted.

Loading
Loading