Merge branch 'main' into 1533-update-slack-link

Signed-off-by: Jean-Christophe Morin <[email protected]>
AcademySoftwareFoundation · Nov 11, 2023 · 9ecfe0c · 9ecfe0c
2 parents ebb3d75 + 6583395
commit 9ecfe0c
Show file tree

Hide file tree

Showing 98 changed files with 555 additions and 7,408 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+# Set update schedule for GitHub Actions
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"
+
+  - package-ecosystem: "pip"
+    directory: "/docs"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"
diff --git a/.github/scripts/store_benchmark.py b/.github/scripts/store_benchmark.py
@@ -59,7 +59,8 @@ def store_result():
     destdir = '-'.join((
         time.strftime("%Y.%m.%d"),
         "%d.%d" % sys.version_info[:2],
-        _rez_version
+        # TODO: We could read the version from summary.json...
+        _rez_version,
     ))
 
     destpath = os.path.join(artifacts_dir, destdir)

diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -5,27 +5,25 @@ name: benchmark
 on:
   release:
     types: [released]
+  pull_request:
+    types: [opened, synchronize, reopened, labeled]
 
 jobs:
   run_benchmark:
     name: run_benchmark
     runs-on: ubuntu-latest
 
+    if: ${{ github.event_name == 'release' || contains(github.event.pull_request.labels.*.name, 'run-benchmarks') }}
+
     strategy:
       matrix:
         python-version:
           - '2.7'
           - '3.7'
 
-      # without this, we're sometimes getting at the end of this job:
-      # '[error] The operation was canceled'.
-      # Do we hit a resource limit?
-      #
-      max-parallel: 1
-
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup python ${{ matrix.python-version }}
         uses: ./.github/actions/setup-python
@@ -84,8 +82,9 @@ jobs:
           name: "benchmark-result-${{ matrix.python-version }}"
           path: .
 
-      - name: Checkout
-        uses: actions/checkout@v3
+      - name: Checkout (release)
+        uses: actions/checkout@v4
+        if: ${{ github.event_name =='release' }}
         with:
           ref: main
           path: src
@@ -96,8 +95,14 @@ jobs:
           #
           token: "${{ secrets.GH_ACTION_TOKEN }}"
 
+      - name: Checkout (pr)
+        uses: actions/checkout@v4
+        if: ${{ github.event_name !='release' }}
+        with:
+          path: src
+
       - name: Setup python ${{ matrix.python-version }}
-        uses: ./.github/actions/setup-python
+        uses: ./src/.github/actions/setup-python
         with:
           python-version: ${{ matrix.python-version }}
           os: ubuntu-latest
@@ -121,13 +126,23 @@ jobs:
           python ./.github/scripts/store_benchmark.py
         working-directory: src
 
+      - name: Create summary
+        run: |
+          echo '<details>' >> $GITHUB_STEP_SUMMARY
+          echo '<summary>Results</summary>' >> $GITHUB_STEP_SUMMARY
+          cat metrics/benchmarking/RESULTS.md >> $GITHUB_STEP_SUMMARY
+          echo '</details>' >> $GITHUB_STEP_SUMMARY
+        working-directory: src
+
       - name: Setup git config
+        if: ${{ github.event_name == 'release' }}
         run: |
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
         working-directory: src
 
       - name: Git commit and push
+        if: ${{ github.event_name == 'release' }}
         run: |
           if [[ "$(git status --porcelain)" == "" ]]; then
             echo "Nothing new to commit"

diff --git a/.github/workflows/copyright.yaml b/.github/workflows/copyright.yaml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4

diff --git a/.github/workflows/core.yaml b/.github/workflows/core.yaml
@@ -24,20 +24,19 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  main:
-    name: main
+  install_script:
+    name: install_script
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         python-version:
-          - '2.7'
           - '3.7'
       fail-fast: false
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup python ${{ matrix.python-version }}
         uses: ./.github/actions/setup-python
@@ -82,3 +81,74 @@ jobs:
             --schema \
             --solver \
             --version
+
+  pip:
+    name: pip
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version:
+          - '2.7'
+          - '3.7'
+      fail-fast: false
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup python ${{ matrix.python-version }}
+        uses: ./.github/actions/setup-python
+        with:
+          python-version: ${{ matrix.python-version }}
+          os: ubuntu-latest
+
+      - name: Install Rez
+        run: |
+          set -ex
+          if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
+              eval "$(conda shell.bash hook)"
+              conda activate python
+          fi
+
+          python --version
+          python -m pip install .
+
+      - name: Install Rez test dependencies
+        run: |
+          set -ex
+          if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
+              eval "$(conda shell.bash hook)"
+              conda activate python
+          fi
+
+          python --version
+          python -m pip install pytest pytest-cov
+
+      # TODO: Add a --core rez-selftest option. Some test suites (eg test_context)
+      # have some 'core' parts (eg not reliant on a shell). It would be good to just
+      # run those parts when --core is present, rather than skipping the entire
+      # test class. This will be easier once ported to pytest.
+      - name: Run Rez Tests
+        run: |
+          set -ex
+          if [[ "${{ matrix.python-version }}" == "2.7" ]]; then
+              eval "$(conda shell.bash hook)"
+              conda activate python
+          fi
+
+          python --version
+
+          rez-selftest -v \
+            --config \
+            --copy_package \
+            --formatter \
+            --imports \
+            --packages \
+            --package_filter \
+            --packages_order \
+            --resources_ \
+            --rex \
+            --schema \
+            --solver \
+            --version
diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4

diff --git a/.github/workflows/installation.yaml b/.github/workflows/installation.yaml
@@ -102,8 +102,12 @@ jobs:
             }
             pip install --target C:\ProgramData\rez .
 
+        exclude:
+        - method: install
+          python-version: '2.7'
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup python ${{ matrix.python-version }}
       uses: ./.github/actions/setup-python

diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml
@@ -28,13 +28,12 @@ jobs:
         os-version:
           - '11'
         python-version:
-          - '2.7'
           - '3.7'
       fail-fast: false
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup python ${{ matrix.python-version }}
         uses: ./.github/actions/setup-python

diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4

diff --git a/.github/workflows/ubuntu.yaml b/.github/workflows/ubuntu.yaml
@@ -29,13 +29,12 @@ jobs:
           - '20.04'
           - '22.04'
         python-version:
-          - '2.7'
           - '3.7'
       fail-fast: false
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup python ${{ matrix.python-version }}
         uses: ./.github/actions/setup-python

diff --git a/.github/workflows/wiki.yaml b/.github/workflows/wiki.yaml
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Determine base image tag
         id: base
@@ -223,7 +223,7 @@ jobs:
 
       - name: Checkout
         if: steps.inspect.outputs.image_exists == 'false'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build base image
         if: steps.inspect.outputs.image_exists == 'false'
@@ -287,7 +287,7 @@ jobs:
 
       - name: Checkout
         if: steps.inspect.outputs.image_exists == 'false'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Pull base image
         if: steps.inspect.outputs.image_exists == 'false'
@@ -331,7 +331,6 @@ jobs:
         os-version:
           - '2019'
         py-version:
-          - '2.7.17'
           - '3.7.5'
 
     steps:
@@ -344,7 +343,7 @@ jobs:
           Write-Output "Using image ${docker_image}..."
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Pull py image
         run: |

diff --git a/ASWF/TSC/meeting-notes/2023-07-20.md → ASWF/TSC/meeting-notes/2023-07-20/notes.md b/ASWF/TSC/meeting-notes/2023-07-20.md → ASWF/TSC/meeting-notes/2023-07-20/notes.md
@@ -134,7 +134,7 @@
   * Several people got interested by the openmoonray rez package and some of what it had inside it, so dreamworks graciously agreed to talk about some of what they do, how they do it, etc.
 * (JB):
   * I have some slides, manage our team, and we have a few people here to answer questions and so forth.
-  * (Demo)
+  * Presentation: [Slides](presentation.pdf).
   * (Q&A with Joel Pollock, Matthew Low, Ibrahim Sani Kache)
 
 ### Ending remarks

diff --git a/ASWF/TSC/meeting-notes/2023-07-20/presentation.pdf b/ASWF/TSC/meeting-notes/2023-07-20/presentation.pdf