Feature/improved automated testing

.github/workflows/ci_cd.yml

@@ -84,12 +84,20 @@ jobs:
         os: [ubuntu-latest, windows-latest]
         python-version: ["3.9", "3.10", "3.11"]
     steps:
+      - name: Install dependencies
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install gobject-introspection
+          sudo apt update
+          sudo apt install python3-dev libgirepository1.0-dev libcairo2-dev gir1.2-secret-1 gnome-keyring
       - name: Build wheelhouse and perform smoke test
         uses: ansys/actions/build-wheelhouse@v8
         with:
           library-name: ${{ env.PACKAGE_NAME }}
           operating-system: ${{ matrix.os }}
           python-version: ${{ matrix.python-version }}
+          whitelist-license-check: email_validator
 
   tests:
     name: Tests and coverage
@@ -101,12 +109,18 @@ jobs:
        python-version: ["3.9","3.10","3.11"]
       fail-fast: false
     steps:
+      - name: Install dependencies
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pandoc
+          sudo apt-get install texlive-latex-extra texlive-xetex texlive-fonts-extra
+          sudo apt-get install gobject-introspection
+          sudo apt update
+          sudo apt install python3-dev libgirepository1.0-dev libcairo2-dev gir1.2-secret-1 gnome-keyring
       - uses: ansys/actions/tests-pytest@v8
         env:
           CONCEPTEV_PASSWORD: ${{ secrets.CONCEPTEV_PASSWORD }}
-          CONCEPTEV_URL: ${{ vars.CONCEPTEV_URL }}
-          CONCEPTEV_USERNAME: ${{ vars.CONCEPTEV_USERNAME }}
-          OCM_URL: ${{ vars.OCM_URL }}
           POETRY_VIRTUALENVS_CREATE: ${{ vars.POETRY_VIRTUALENVS_CREATE }}
         with:
           pytest-extra-args: "-m 'not integration' --cov=ansys --cov-report=term --cov-report=html:.cov/html"
@@ -137,14 +151,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y pandoc
           sudo apt-get install texlive-latex-extra texlive-xetex texlive-fonts-extra
+          sudo apt-get install gobject-introspection
+          sudo apt update
+          sudo apt install python3-dev libgirepository1.0-dev libcairo2-dev gir1.2-secret-1 gnome-keyring
           # sudo apt-get install libgl1-mesa-glx xvfb texlive-latex-extra latexmk graphviz texlive-xetex texlive-fonts-extra qpdf texlive-xetex xindy
 
       - name: Verify Pandoc installation
         run: pandoc --version
 
       - name: Build documentation
         env:
-          CONCEPTEV_USERNAME: ${{ secrets.CONCEPTEV_USERNAME }}
           CONCEPTEV_PASSWORD: ${{ secrets.CONCEPTEV_PASSWORD }}
         uses: ansys/actions/doc-build@v8
         with:

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
+Copyright (c) 2023 - 2025 ANSYS, Inc. and/or its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

doc/changelog.d/168.added.md

@@ -0,0 +1 @@
+Feature/improved automated testing

examples/simple_workflow.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
+# Copyright (C) 2023 - 2025 ANSYS, Inc. and/or its affiliates.
 # SPDX-License-Identifier: MIT
 #
 #
@@ -24,36 +24,29 @@
 #
 # This example shows how to use PyConcentEV to perform basic operations.
 
+import datetime
+
 # ## Perform required imports
 #
 # Perform required imports.
-
-import datetime
 import os
 from pathlib import Path
 
-import plotly.graph_objects as go
-
-from ansys.conceptev.core import app, auth
+# Set the path to the configuration file
+SETTINGS_FILE = Path().cwd().parents[2] / "tests" / "config.toml"
+print(SETTINGS_FILE)
+print(SETTINGS_FILE.exists())
+os.environ["PYCONCEPTEV_SETTINGS"] = str(SETTINGS_FILE)
 
-# ## Set up environment variables
-# AnsysID is the only supported method.
-# We only use the other one here for automated testing. So set to True.
-use_ansys_id = False  # True
 
+import plotly.graph_objects as go
 
-if not (use_ansys_id):
-    # Set environment variables for ConceptEV username and password if they don't exist!
-    if os.environ.get("CONCEPTEV_USERNAME") is None:
-        os.environ["CONCEPTEV_USERNAME"] = "joe.blogs@my_work.com"
-    if os.environ.get("CONCEPTEV_PASSWORD") is None:
-        os.environ["CONCEPTEV_PASSWORD"] = "sup3r_s3cr3t_passw0rd"
+from ansys.conceptev.core import app, auth
 
 # ## Define example data
 #
 # You can obtain example data from the schema sections of the API documentation.
 
-# +
 MOTOR_LAB_FILE = Path("resources") / "e9.lab"
 MOTOR_LOSS_MAP_FILE = Path("resources") / "e9.xlsx"
 AERO_1 = {
@@ -106,13 +99,10 @@
 
 motor_data = {"name": "e9", "component_type": "MotorLabID", "inverter_losses_included": False}
 
-if use_ansys_id:
-    # Get a token from Ansys ID (Preferred)
-    msal_app = auth.create_msal_app()
-    token = auth.get_ansyId_token(msal_app)
-else:
-    # Get a token from OCM (Deprecated)
-    token = app.get_token()
+
+# Get a token from Ansys ID
+msal_app = auth.create_msal_app()
+token = auth.get_ansyId_token(msal_app)
 
 
 # Use API client for the Ansys ConceptEV service
@@ -124,7 +114,7 @@
     # Uncomment to print accounts IDs
     # print(f"Account IDs: {accounts}\n")
 
-    account_id = accounts["[email protected]"]
+    account_id = accounts["ConceptEv Test Account"]
     hpc_id = app.get_default_hpc(token, account_id)
     product_id = app.get_product_id(token)
     # Uncomment to print HPC ID
@@ -237,22 +227,16 @@
     }
     created_requirement = app.post(client, "requirements", data=requirement)
     print(f"Created requirement: {created_requirement}")
-# -
-
 
-# Following code is not working in the pipelne but should work in a local environment.
-
-# Submit a job and show the result.
-# with app.get_http_client(token, design_instance_id) as client:
-#
-#     # Create and submit a job
-#     concept = app.get(client, "/concepts", id=design_instance_id, params={"populated": True})
-#     job_info = app.create_submit_job(client, concept, account_id, hpc_id)
-#
-#     # Read the results and show the result in your browser
-#     results = app.read_results(client, job_info, calculate_units=False, filtered=True)
-#     x = results[0]["capability_curve"]["speeds"]
-#     y = results[0]["capability_curve"]["torques"]
-#
-#     fig = go.Figure(data=go.Scatter(x=x, y=y))
-#     fig.show()
+    # Create and submit a job
+    concept = app.get(client, "/concepts", id=design_instance_id, params={"populated": True})
+    job_info = app.create_submit_job(client, concept, account_id, hpc_id)
+
+    # Doesn't work in test environment but should work for users.
+    # # Read the results and show the result in your browser
+    # results = app.read_results(client, job_info, calculate_units=False, filtered=True)
+    # x = results[0]["capability_curve"]["speeds"]
+    # y = results[0]["capability_curve"]["torques"]
+    #
+    # fig = go.Figure(data=go.Scatter(x=x, y=y))
+    # fig.show()