Merge branch 'main' into release/2025.1

Author: RobPasMue

.github/workflows/ci-build.yml

@@ -49,7 +49,7 @@ jobs:
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
           target: "all"
-          whitelist-license-check: "attrs" # This has MIT license but fails the check
+          whitelist-license-check: "attrs,referencing,jeepney" # This has MIT license but fails the check
 
   docs-style:
     name: Documentation Style Check
@@ -130,7 +130,7 @@ jobs:
           operating-system: ${{ runner.os }}
           python-version: ${{ matrix.python-version }}
           target: "all"
-          whitelist-license-check: "attrs" # This has MIT license but fails the check
+          whitelist-license-check: "attrs,referencing,jeepney" # This has MIT license but fails the check
 
       - name: List dependencies (pip freeze)
         run: |

.github/workflows/create-milestone.yml

@@ -46,6 +46,7 @@ jobs:
             "ansys/pypim",
             "ansys/pyprimemesh",
             "ansys/pyrocky",
+            "ansys/pyscadeone",
             "ansys/pyseascape",
             "ansys/pysherlock",
             "ansys/pysimai",

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.1
+  rev: v0.9.7
   hooks:
     - id: ruff
     - id: ruff-format
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.3.0
+  rev: v2.4.1
   hooks:
   - id: codespell
     args: ["--ignore-words=ignore_words.txt"]
@@ -29,12 +29,12 @@ repos:
 
 # this validates our github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.31.0
+  rev: 0.31.2
   hooks:
     - id: check-github-workflows
 
 - repo: https://github.com/ansys/pre-commit-hooks
-  rev: v0.4.4
+  rev: v0.5.1
   hooks:
   - id: add-license-headers
     args:

README.rst

@@ -73,6 +73,7 @@ The ``pyansys`` metapackage ensures compatibility between these PyAnsys packages
 - `PyPIM <https://pypim.docs.pyansys.com/>`_: Pythonic interface to communicate with the Ansys PIM (Product Instance Management) API.
 - `PyPrimeMesh <https://prime.docs.pyansys.com/>`_: Python library to acquire geometries and prepare surface and volume meshes for multiple solvers.
 - `PyRocky <https://rocky.docs.pyansys.com/>`_: Python library to communicate with Ansys Rocky using Rocky PrePost API.
+- `PyScadeOne <https://scadeone.docs.pyansys.com/>`_: Pythonic interface for Ansys Scade One.
 - `PySeascape <https://seascape.docs.pyansys.com/>`_: Pythonic interface to communicate with Ansys RedHawkSC and TotemSC.
 - `PySherlock <https://sherlock.docs.pyansys.com/>`_: Pythonic interface to communicate with Ansys Sherlock.
 - `PySimAI <https://simai.docs.pyansys.com/>`_: Pythonic interface to use SimAI.

doc/source/_static/css/landing_page.css

@@ -10,31 +10,40 @@ html {
 }
 .landing-page-sidebar-section {
   margin-bottom: 2rem;
-  font-weight: bold;
+  font-weight: 700;
   display: flex;
   flex-direction: column;
-  gap: 1rem;
+  gap: 0.25rem;
+}
+
+.show-more {
+  margin-top: 1rem;
 }
+
 .landing-page-sidebar-section span {
-  font-size: 18px;
-  font-weight: bold;
+  font-size: 0.85rem;
 }
+
 .family-row,
 .tag-row {
   display: flex;
   align-items: center;
   margin: 5px 0;
+  font-weight: 400;
+  padding: 0.25rem;
 }
+
 .family-row input,
 .tag-row input {
-  margin-right: 10px;
-}
-.family-name {
-  margin-right: 10px;
+  margin-right: 0.625rem;
+  height: 1rem;
+  width: 1rem;
 }
-.family-count {
+
+.family-count,
+.tag-count {
   margin-left: auto;
-  background-color: lightgrey;
+  background-color: var(--ast-sidebar-hover-background);
   border-radius: 50%;
   padding: 0.25rem 0.75rem;
 }
@@ -44,14 +53,7 @@ html {
   flex-wrap: wrap;
   gap: 0.5rem;
 }
-.selected-family {
-  display: flex;
-  align-items: center;
-  gap: 1rem;
-  padding: 0.25rem 0.5rem;
-  border-radius: 5px;
-  background-color: lightgrey;
-}
+
 .remove-family {
   cursor: pointer;
   color: black;
@@ -94,6 +96,16 @@ html {
   padding: 0.5rem;
   padding-left: 1rem;
 }
+.sd-bg-muted {
+  background-color: var(--ast-sidebar-hover-background) !important;
+  border-radius: 999px;
+  font-size: 12px;
+  line-height: 16px;
+}
+
+[data-theme="dark"] .sd-bg-muted {
+  background-color: #3d3d3d !important;
+}
 
 @media screen and (max-width: 768px) {
   .projects {
@@ -109,3 +121,13 @@ html {
     width: 90%;
   }
 }
+
+.selected-tag,
+.selected-family {
+  display: inline-block;
+  background-color: var(--ast-sidebar-hover-background);
+  padding: 0.25rem 0.5rem;
+  border-radius: 0.25rem;
+  margin: 0.25em;
+  font-weight: 600;
+}

doc/source/_static/js/landing_page.js

@@ -51,12 +51,15 @@ function displayFamilies(familyCounts) {
   familiesContainer.innerHTML = "";
 
   const sortedFamilies = Object.keys(familyCounts).sort();
+  const maxVisible = 5; // Show only first 5 initially
+  let showMoreClicked = false;
 
-  sortedFamilies.forEach((family) => {
+  sortedFamilies.forEach((family, index) => {
     const familyCount = familyCounts[family];
 
     const familyRow = document.createElement("div");
     familyRow.className = "family-row";
+    if (index >= maxVisible) familyRow.style.display = "none"; // Hide extra items initially
 
     const checkbox = document.createElement("input");
     checkbox.type = "checkbox";
@@ -67,29 +70,53 @@ function displayFamilies(familyCounts) {
     familyName.className = "family-name";
     familyName.textContent = family;
 
-    const familyCountElem = document.createElement("span");
-    familyCountElem.className = "family-count";
-    familyCountElem.textContent = `(${familyCount})`;
+    const familyCountElement = document.createElement("span");
+    familyCountElement.className = "family-count";
+    familyCountElement.textContent = `${familyCount}`;
 
     familyRow.appendChild(checkbox);
     familyRow.appendChild(familyName);
-    //familyRow.appendChild(familyCountElem);
+    familyRow.appendChild(familyCountElement);
 
     familiesContainer.appendChild(familyRow);
   });
+
+  // Handle "Show more" click
+  const showMoreButton = document.querySelector(".product-families .show-more");
+  const FamilyRows = document.querySelectorAll(".family-row");
+  showMoreButton.addEventListener("click", () => {
+    if (showMoreClicked) {
+      FamilyRows.forEach((row, index) => {
+        if (index >= maxVisible) {
+          row.style.display = "none";
+        }
+      });
+      showMoreButton.textContent = "Show more";
+      showMoreClicked = false;
+    } else {
+      FamilyRows.forEach((row) => {
+        row.style.display = "flex";
+      });
+      showMoreButton.textContent = "Show less";
+      showMoreClicked = true;
+    }
+  });
 }
 
 function displayTags(tagCounts) {
   const tagsContainer = document.getElementById("product-tags-list");
   tagsContainer.innerHTML = "";
 
   const sortedTags = Object.keys(tagCounts).sort();
+  const maxVisible = 5; // Show only first 5 initially
+  let showMoreClicked = false;
 
-  sortedTags.forEach((tag) => {
+  sortedTags.forEach((tag, index) => {
     const tagCount = tagCounts[tag];
 
     const tagRow = document.createElement("div");
     tagRow.className = "tag-row";
+    if (index >= maxVisible) tagRow.style.display = "none"; // Hide extra items initially
 
     const checkbox = document.createElement("input");
     checkbox.type = "checkbox";
@@ -100,19 +127,56 @@ function displayTags(tagCounts) {
     tagName.className = "tag-name";
     tagName.textContent = tag;
 
-    const tagCountElem = document.createElement("span");
-    tagCountElem.className = "tag-count";
-    tagCountElem.textContent = `(${tagCount})`;
+    const tagCountElement = document.createElement("span");
+    tagCountElement.className = "tag-count";
+    tagCountElement.textContent = `${tagCount}`;
 
     tagRow.appendChild(checkbox);
     tagRow.appendChild(tagName);
-    //tagRow.appendChild(tagCountElem);
+    tagRow.appendChild(tagCountElement);
 
     tagsContainer.appendChild(tagRow);
   });
+
+  // Handle "Show more" click
+  const showMoreButton = document.querySelector(".product-tags .show-more");
+  const TagRows = document.querySelectorAll(".tag-row");
+  showMoreButton.addEventListener("click", () => {
+    if (showMoreClicked) {
+      TagRows.forEach((row, index) => {
+        if (index >= maxVisible) {
+          row.style.display = "none";
+        }
+      });
+      showMoreButton.textContent = "Show more";
+      showMoreClicked = false;
+    } else {
+      TagRows.forEach((row) => {
+        row.style.display = "flex";
+      });
+      showMoreButton.textContent = "Show less";
+      showMoreClicked = true;
+    }
+  });
 }
 
 function handleFamilySelection() {
+  applyFilters();
+}
+
+function handleTagSelection() {
+  applyFilters();
+}
+
+function applyFilters() {
+  const SelectedTagsContainer = document.getElementById(
+    "selected-product-tags-list",
+  );
+  const SelectedFamiliesContainer = document.getElementById(
+    "selected-product-families-list",
+  );
+  SelectedTagsContainer.innerHTML = "";
+  SelectedFamiliesContainer.innerHTML = "";
   const selectedFamilies = Array.from(
     document.querySelectorAll(
       '#product-families-list input[type="checkbox"]:checked',
@@ -121,58 +185,58 @@ function handleFamilySelection() {
     checkbox.id.replace("family-", "").replace("\\ ", "-").toLowerCase(),
   );
 
-  console.log("Selected families:", selectedFamilies);
-
-  const projectCards = document.querySelectorAll(".project-card");
-
-  projectCards.forEach((card) => {
-    const family = card.getAttribute("data-family").toLowerCase();
-    console.log("Family:", family);
-    card.style.display =
-      selectedFamilies.length === 0 || selectedFamilies.includes(family)
-        ? "flex"
-        : "none";
-  });
-}
-
-function handleTagSelection() {
   const selectedTags = Array.from(
     document.querySelectorAll(
       '#product-tags-list input[type="checkbox"]:checked',
     ),
   ).map((checkbox) =>
     checkbox.id.replace("tag-", "").replace("\\ ", "-").toLowerCase(),
   );
+  for (const tag of selectedTags) {
+    const selectedTag = document.createElement("span");
+    selectedTag.className = "selected-tag";
+    selectedTag.textContent = tag;
+    SelectedTagsContainer.appendChild(selectedTag);
+  }
+
+  for (const family of selectedFamilies) {
+    const selectedFamily = document.createElement("span");
+    selectedFamily.className = "selected-family";
+    selectedFamily.textContent = family;
+    SelectedFamiliesContainer.appendChild(selectedFamily);
+  }
 
+  console.log("Selected families:", selectedFamilies);
   console.log("Selected tags:", selectedTags);
 
   const projectCards = document.querySelectorAll(".project-card");
 
   projectCards.forEach((card) => {
+    const family = card.getAttribute("data-family").toLowerCase();
     const rawTags = card.getAttribute("data-tags");
 
-    if (!rawTags) {
-      card.style.display = "none";
-      return;
-    }
-
-    // Parse the data-tags string
     let cardTags = [];
-    try {
-      cardTags = JSON.parse(rawTags.replace(/'/g, '"'));
-    } catch (error) {
-      console.error("Error parsing data-tags:", rawTags, error);
-      card.style.display = "none";
-      return;
+    if (rawTags) {
+      try {
+        cardTags = JSON.parse(rawTags.replace(/'/g, '"')).map((tag) =>
+          tag.toLowerCase(),
+        );
+      } catch (error) {
+        console.error("Error parsing data-tags:", rawTags, error);
+      }
     }
 
-    const cardTagsLower = cardTags.map((tag) => tag.toLowerCase());
-    const hasMatchingTag = selectedTags.some((tag) =>
-      cardTagsLower.includes(tag),
-    );
+    // Check if the card matches the selected families
+    const matchesAllFamilies =
+      selectedFamilies.length === 0 || selectedFamilies.includes(family);
+
+    // Check if the card matches the selected tags
+    const matchesAllTags =
+      selectedTags.length === 0 ||
+      selectedTags.every((tag) => cardTags.includes(tag));
 
-    card.style.display =
-      selectedTags.length === 0 || hasMatchingTag ? "flex" : "none";
+    // Show only if both family & tag filters match (or if no filter is applied)
+    card.style.display = matchesAllFamilies && matchesAllTags ? "flex" : "none";
   });
 }