PR review

Author: cbellot000

.ci/azure-pipelines.yml

@@ -1,4 +1,4 @@
-# azure pipelines build and test pymapdl
+# azure pipelines build and test pydpf
 
 variables:
   ALLOW_PLOTTING: true
@@ -8,7 +8,8 @@ variables:
 trigger:
   branches:
     include:
-    - '*'
+    - 'master*'
+    - 'release-*'
     exclude:
     - gh-pages
   tags:
@@ -26,9 +27,11 @@ jobs:
 - job: Windows
   variables:
     python.version: '3.8'
+    ANSYS_VERSION: 221
     DISPLAY: ':99.0'
     PYANSYS_OFF_SCREEN: True
     DPF_PORT: 32772
+    vstsPackageVersion: '22.1.1'
   pool:
     vmImage: 'windows-2019'
 
@@ -42,50 +45,39 @@ jobs:
         ArtifactName: 'ansys_dpf_core_wheel'
       enabled: true
 
+    - template: templates\kill-servers-windows.yml
+
     - script: |
+        cd $(System.DefaultWorkingDirectory)
         pip install -r requirements_test.txt
       displayName: Install Test Environment
-
-    - script: |
-        set THISDIR=$(System.DefaultWorkingDirectory)
-        cd tests
-        set AWP_ROOT212=%THISDIR%\server\v212
-        pytest -v --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml --reruns 3
-        
-      displayName: Test Core API
-      timeoutInMinutes: 10
-
-    - task: PublishTestResults@2
-      inputs:
-        testResultsFormat: 'JUnit'
-        testResultsFiles: 'tests/junit/test-results.xml'
-        testRunTitle: 'windowsTests'
-        publishRunAttachments: true
       condition: always()
 
     - script: |
-        set THISDIR=$(System.DefaultWorkingDirectory)
         cd $(System.DefaultWorkingDirectory)
-        set AWP_ROOT212=%THISDIR%\server\v212
-        pytest --doctest-modules --junitxml=junit/test-doctests-results.xml ansys\dpf\core
+        pytest --doctest-modules --junitxml=junit/test-doctests-results.xml ansys/dpf/core
       condition: always()
       displayName: Test API Docstrings
-      timeoutInMinutes: 5
+      timeoutInMinutes: 15
 
     - task: PublishTestResults@2
       inputs:
         testResultsFormat: 'JUnit'
-        testResultsFiles: 'junit/test-doctests-results.xml'
+        testResultsFiles: '$(System.DefaultWorkingDirectory)/junit/test-doctests-results.xml'
         testRunTitle: 'docTestsTests'
         publishRunAttachments: true
       condition: always()
 
-    - script:  |
-        set THISDIR=$(System.DefaultWorkingDirectory)
-        set AWP_ROOT212=%THISDIR%\server\v212
-        python .ci/run_examples.py
-      displayName: 'Run example scripts'
-      timeoutInMinutes: 5
+    - template: templates\kill-servers-windows.yml
+
+    - script: |
+        @echo on
+        cd $(System.DefaultWorkingDirectory)
+        rmdir /s /q .\ansys\
+      displayName: Remove local copy of ansys-dpf-core
+      condition: always()
+
+    - template: templates\run-unit-tests-windows.yml
 
     - script: |
         pip install twine
@@ -100,48 +92,55 @@ jobs:
      
 
     - script: |
-        type $(System.DefaultWorkingDirectory)\server\v212\aisol\bin\winx64\log.txt
+        type $(System.DefaultWorkingDirectory)\server\v$(ANSYS_VERSION)\aisol\bin\winx64\log.txt
       displayName:  'Show DPF Server Logs'
-      condition: always() 
+      condition: always()
+      continueOnError: true
     
     - template: templates\kill-servers-windows.yml   
-      
+
+
+- job: WindowsAnsys2021R2
+  variables:
+    python.version: '3.8'
+    ANSYS_VERSION: 212
+    DISPLAY: ':99.0'
+    PYANSYS_OFF_SCREEN: True
+    DPF_PORT: 32772
+    vstsPackageVersion: '21.2.3'
+  pool:
+    vmImage: 'windows-2019'
+
+  steps:
+    - template: templates\prepare-environment-windows.yml
+
+    - script: |
+            pip install ansys-grpc-dpf==0.3.0
+      displayName: Install proper version of ansys-grpc-dpf
+
+    - script: |
+        rmdir /s /q .\ansys\
+      displayName: Remove local copy of ansys-dpf-core
+
+    - template: templates\run-unit-tests-windows.yml
+
 
 - job: Linux
   variables:
     python.version: '3.7'  # due to VTK 8.1.2 requirement for docbuild
-    DISPLAY: ':99.0'
+    ANSYS_VERSION: 221
     PYANSYS_OFF_SCREEN: True
     DPF_PORT: 50055
     TEMP: $(System.DefaultWorkingDirectory)/temp
-    AWP_ROOT212: $(System.DefaultWorkingDirectory)/server/v212
-    
+    AWP_ROOT221: $(System.DefaultWorkingDirectory)/server/v221
+    vstsPackageVersion: "22.1.1"
   pool:
     vmImage: 'ubuntu-20.04'
   steps:
     - template: templates\prepare-environment-linux.yml
 
-    - script: |
-        pip install -r requirements_test.txt
-        pip install pytest-azurepipelines        
-        export AWP_ROOT212=${SYSTEM_DEFAULTWORKINGDIRECTORY}/server/v212
-        cd tests
-        export DPF_IP=$(hostname -i)
-        xvfb-run pytest -v --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml  --reruns 3      
-        export PATH=`pwd`
-        echo ${PATH} 
-      displayName: Test Core API
-      
-    - task: PublishTestResults@2
-      inputs:
-        testResultsFormat: 'JUnit'
-        testResultsFiles: 'junit/test-results.xml' 
-        testRunTitle: 'linuxTests'
-        publishRunAttachments: true
-        searchFolder: 'tests/'
-      condition: always()
-      
-      
+    - template: templates\run-unit-tests-linux.yml
+
     - script : |
         echo $0
         if pgrep -x "Ans.Dpf.Grpc" > /dev/null
@@ -155,12 +154,13 @@ jobs:
 - job: DocumentationLinux
   variables:
     python.version: '3.7'  # due to VTK 8.1.2 requirement for docbuild
+    ANSYS_VERSION: 221
     PYANSYS_OFF_SCREEN: True
     DPF_PORT: 50055
     TEMP: $(System.DefaultWorkingDirectory)/temp
-    AWP_ROOT212: $(System.DefaultWorkingDirectory)/server/v212
+    AWP_ROOT221: $(System.DefaultWorkingDirectory)/server/v$(ANSYS_VERSION)
     GH_DOC_BRANCH: 'gh-pages'
-    
+    vstsPackageVersion: "22.1.1"
   pool:
     vmImage: 'ubuntu-20.04'
   steps:
@@ -174,6 +174,7 @@ jobs:
         sphinx-apidoc -o docs/source/api ansys ansys/dpf/core/aeneid.py -f --implicit-namespaces --separate --no-headings
         xvfb-run make -C docs html SPHINXOPTS="-w build_errors.txt -N"
       displayName: Build Documentation
+      retryCountOnTaskFailure: 1 # Max number of retries; default is zero
 
     - task: ArchiveFiles@2
       inputs:
@@ -183,13 +184,15 @@ jobs:
         archiveFile: '$(System.DefaultWorkingDirectory)/docs/archive/doc-ansys-dpf-core.zip'
         replaceExistingArchive: true 
       displayName: 'DOCUMENTATION: zip artifacts'
+      condition: always()
 
     - task: PublishBuildArtifacts@1
       displayName: 'DOCUMENTATION: publish artifacts'
       inputs:
         PathtoPublish: '$(System.DefaultWorkingDirectory)/docs/archive'
         ArtifactName: doc-ansys-dpf-core
-      enabled: true   
+      enabled: true
+      condition: always()
 
     - powershell: |
         git init

.ci/build_doc.bat

@@ -1,4 +1,3 @@
-ECHO %AWP_ROOT212%
 set SPHINX_APIDOC_OPTIONS=inherited-members
 call sphinx-apidoc -o ../docs/source/api ../ansys ../ansys/dpf/core/aeneid.py -f --implicit-namespaces --separate  --no-headings
 pushd .

.ci/edit_ansys_version.py

@@ -0,0 +1,19 @@
+import sys
+import pkgutil
+import os
+
+if __name__ == "__main__":
+    directory = os.path.dirname(pkgutil.get_loader("ansys.dpf.core").path)
+    file_path = os.path.join(directory, "_version.py")
+    for i, arg in enumerate(sys.argv):
+        if arg == "--version":
+            print(sys.argv[i+1])
+            version = sys.argv[i+1]
+    file = open(file_path, 'r')
+    lines = file.readlines()
+    for i, line in enumerate(lines):
+        if "__ansys_version__" in line:
+            lines[i] = f'__ansys_version__ = "{version}"\n'
+    file.close()
+    with open(file_path, 'w') as file:
+        file.writelines(lines)

.ci/templates/prepare-environment-linux.yml

@@ -15,9 +15,11 @@ steps:
     displayName: Install OS packages
 
   - script: |
+      .ci/setup_headless_display.sh
       pip install -r .ci/requirements_test_xvfb.txt
       xvfb-run python .ci/display_test.py
     displayName: Test virtual framebuffer
+    continueOnError: true
 
   - script: |
       pip install -r requirements_build.txt
@@ -29,14 +31,21 @@ steps:
       xvfb-run python -c "from ansys.dpf import core; print(core.Report())"
     displayName: Install ansys-dpf-core
 
+  - task: PythonScript@0
+    inputs:
+      scriptSource: 'filePath'
+      scriptPath: ".ci/edit_ansys_version.py"
+      arguments: "--version $(ANSYS_VERSION)"
+    displayName: "Set ansys version"
+
   - task: UniversalPackages@0
     inputs:
       command: "download"
       downloadDirectory: "$(System.DefaultWorkingDirectory)"
       feedsToUse: "internal"
       vstsFeed: "705e121a-9631-49f5-8aaf-c7142856f923"
       vstsFeedPackage: "dpf-linux" #TODO: update hash of packages
-      vstsPackageVersion: "21.2.5"
+      vstsPackageVersion: $(vstsPackageVersion)
     displayName: Download DPF linux package
 
   - script: |
@@ -54,11 +63,13 @@ steps:
     displayName: Display env
 
   - script: |
-      cd ${AWP_ROOT212}/aisol/bin/linx64
+      cd ${AWP_ROOT$(ANSYS_VERSION)}/aisol/bin/linx64
       pwd
       chmod 755 Ans.Dpf.Grpc.sh
       chmod 755 Ans.Dpf.Grpc.exe
       ./Ans.Dpf.Grpc.sh --port 50054 & > log.txt
       export DPF_IP=$(hostname -i)
       python -c "from ansys.dpf import core; core.connect_to_server(ip= '${DPF_IP}', port=50054); print('Python Connected')"
     displayName: Start DPF Server
+    timeoutInMinutes: 1
+    retryCountOnTaskFailure: 1 # Max number of retries; default is zero

.ci/templates/prepare-environment-windows.yml

@@ -1,4 +1,13 @@
-steps:  
+steps:
+    - powershell: |
+       $curDir = Get-Location
+       New-Variable -Name "AWP_ROOT$($env:ANSYS_VERSION)" -Value $curDir\server\v$env:ANSYS_VERSION -Force
+       write-host "##vso[task.setvariable variable=$((Get-Variable -Name "AWP_ROOT$($env:ANSYS_VERSION)").Name)]$((Get-Variable -Name "AWP_ROOT$($env:ANSYS_VERSION)").Value)"
+
+       "$((Get-Variable -Name "AWP_ROOT$($env:ANSYS_VERSION)").Value)"
+      displayName: 'Set AWP_ROOT$(ANSYS_VERSION)'
+      condition: always()
+
     - powershell: |
         Set-StrictMode -Version Latest
         $ErrorActionPreference = "Stop"
@@ -22,32 +31,41 @@ steps:
       inputs:
         artifactFeeds: 'pyansys'
         onlyAddExtraIndex: true
-        
+
     - script: |
         pip install -r requirements_build.txt
         python setup.py bdist_wheel
         FOR /F %%a in ('dir /s/b dist\*.whl') do SET WHEELPATH=%%a
         ECHO %WHEELPATH% 
         pip install %WHEELPATH%
         cd tests
-        python -c "from ansys.dpf import core; print(core.Report(gpu=False))"           
+        python -c "from ansys.dpf import core; print(core.Report(gpu=False))"
       
       displayName: Install ansys-dpf-core
 
+    - task: PythonScript@0
+      inputs:
+        scriptSource: 'filePath'
+        scriptPath: ".ci/edit_ansys_version.py"
+        arguments: "--version $(ANSYS_VERSION)"
+      displayName: "Set ansys version"
+
     - task: UniversalPackages@0
       inputs:
         command: 'download'
         downloadDirectory: '$(System.DefaultWorkingDirectory)'
         feedsToUse: 'internal'
         vstsFeed: '705e121a-9631-49f5-8aaf-c7142856f923'
         vstsFeedPackage: 'dpf-windows'
-        vstsPackageVersion: '21.2.3'
+        vstsPackageVersion: $(vstsPackageVersion)
 
     - script: |
         @echo on
-        dir $(System.DefaultWorkingDirectory)\server\v212\aisol\bin\winx64
-        set THISDIR=$(System.DefaultWorkingDirectory)
-        cd %THISDIR%\server\v212\aisol\bin\winx64
+        cd %AWP_ROOT$(ANSYS_VERSION)%\aisol\bin\winx64
+        dir %AWP_ROOT$(ANSYS_VERSION)%\aisol\bin\winx64
+        echo %AWP_ROOT$(ANSYS_VERSION)%
         START /B Ans.Dpf.Grpc.bat --address 127.0.0.1 --port %DPF_PORT% > log.txt 2>&1
         python -c "from ansys.dpf import core; core.connect_to_server(port=$(DPF_PORT)); print('Python Connected')"        
-      displayName: Start DPF Server
+      displayName: Start DPF Server
+      timeoutInMinutes: 1
+      retryCountOnTaskFailure: 1 # Max number of retries; default is zero

.ci/templates/run-unit-tests-linux.yml

@@ -0,0 +1,30 @@
+
+steps:
+  - script: |
+      pip install -r requirements_test.txt
+    displayName: Install Test Environment
+    condition: always()
+
+  - script: |
+      xvfb-run python .ci/run_examples.py
+    displayName: "Run example scripts"
+    timeoutInMinutes: 15
+    condition: always()
+
+  - script: |
+      pip install pytest-azurepipelines
+      cd tests
+      export DPF_IP=$(hostname -i)
+      xvfb-run pytest -v -k "not workflow" --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml  --reruns 2
+    displayName: Test Core API
+    condition: always()
+
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFormat: 'JUnit'
+      testResultsFiles: 'junit/test-result*.xml'
+      testRunTitle: 'linuxTests$(ANSYS_VERSION)'
+      publishRunAttachments: true
+      searchFolder: 'tests/'
+    condition: always()
+    displayName: Publish tests