Merge remote-tracking branch 'dhruv/continue_on_missing_packages' int…

…o continue_on_missing_packages

.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)

.github/workflows/benchmark.yaml

@@ -5,24 +5,22 @@ 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
@@ -84,8 +82,9 @@ jobs:
           name: "benchmark-result-${{ matrix.python-version }}"
           path: .
 
-      - name: Checkout
+      - name: Checkout (release)
         uses: actions/checkout@v3
+        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@v3
+        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"

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

ASWF/TSC/meeting-notes/2023-08-17/notes.md

@@ -0,0 +1,91 @@
+# Rez TSC Meeting Notes - 2023-08-17
+
+:movie_camera::scroll: Recording: https://zoom.us/rec/share/2OLhyMTtN6ybQaodW1CUMPCvCRLGUNxsUlb3WcqBCCwlAWV3ELw8xjf53WzkVx-a.nRR2z27w-uJ1rJ5B
+
+## Attendance
+
+* Host: Jean-Christophe Morin
+* Secretary: Jean-Christophe Morin
+* TSC Attendees:
+  * [x] Brendan Abel - Walt-Disney Imagineering
+  * [x] Jean-Christophe Morin - Freelance
+  * [x] Stephen Mackenzie - NVIDIA
+  * [x] Thorsten Kaufmann - Mackevision / Accenture
+* Other Attendees:
+  * Deke Kincaid (Digital Domain)
+  * Dhruv Govil (Apple)
+  * Erwan Leroy (Carfty Apes)
+  * Ibrahim Sani Kache (Dreamworks)
+  * Jason Scott (Pitch Black)
+  * Jeff Bradley (Dreamworks)
+  * Jonas Avrin
+  * John Riddle (Crafty Apes)
+  * Junko V. Igarashi (Crafty Apes)
+
+## Agenda
+* Agenda Issue: https://github.com/AcademySoftwareFoundation/rez/issues/1513
+* ASWF:
+    * [x] Take ownership of https://rez.readthedocs.io [#1517](https://github.com/AcademySoftwareFoundation/rez/issues/1517)
+    * [x] TSC chair transition after Allan stepped down [#1519](https://github.com/AcademySoftwareFoundation/rez/issues/1519)
+* [x] @herronelou presentation on the usage of rez at https://www.craftyapes.com/.
+* [x] Named Variants proposal: Named Variants [#1503](https://github.com/AcademySoftwareFoundation/rez/discussions/1503)
+
+## Short Version / Decisions / Action Items / Important Links
+
+* Action Items:
+  * @AcademySoftwareFoundation/rez-tsc: Find a plan to unblock [#1503](https://github.com/AcademySoftwareFoundation/rez/discussions/1503).
+
+## Details
+
+### ASWF
+
+#### Take ownership of https://rez.readthedocs.io
+
+https://github.com/AcademySoftwareFoundation/rez/issues/1517
+
+* JC:
+    * We discovered that https://rez.readthedocs.io was pointing at the source of an old fork of rez.
+    * Contacted the owner and he gave us admin access.
+    * We now have the ability to update the documentation.
+    * The current page is our own. We pushed an update using tip of the main branch.
+
+#### TSC chair transition after Allan stepped down
+
+https://github.com/AcademySoftwareFoundation/rez/issues/1519
+
+* JC:
+    * Mosty administrative tasks. Should be done now.
+    * See the issue for more details.
+
+## Crafty Apes presentation
+
+* Erwan:
+    * Working at https://www.craftyapes.com/ as the Global Head of 2D.
+    * Want to present what we did at Crafty Apes and how we implemented rez in our pipeline.
+* Presentation: [Slides](presentation.pdf).
+* Q&A: See the recording (attached at the top of this page).
+* Thanks a lot for this great presentation!
+
+## Named Variants proposal
+
+https://github.com/AcademySoftwareFoundation/rez/discussions/1503
+
+* Dhruv:
+    * I made this proposal.
+    * What would the next steps be?
+    * The biggest contention point is how to store named variants in a way
+      that preserves the order and python 2.7 support.
+    * We could use a standard dict, but that won't isn't compatible with Python 2.7.
+    * And it would also only be compatible with 3.7+.
+* Stephen: We could use this as an opportunity to drop support for Python 2.7.
+* Jeff: As a studio that still supports Python 2.7. So we'll stick to the older rez version for a while until we can drop 2.7.
+* JC: It's that it's always an option. Our users are not forced to upgrade to newer version of rez. And rez is failrly stable, so they can stay on an older version if they want to still use Python 2.7.
+* Jason: Agree that studios can just pick an older version of rez if they want.
+* Stephen: Studios can also install multiple versions of rez in parallel.
+* Erwan: When they do so, they'll have to be carefull to not release packages that use features
+  that older versions of rez won't know how to deal with.
+* JC: We'll need to solve that. THough, we have added new package definition fields in the past and we've never heard of failrues due to that.
+* Brendan: rez will ignore attributes it doesn't know. But we still need to find a solution to
+  evolve the package definiton format.
+* Dhruv: What are the next steps?
+* JC: We should revive the discussion on GH. And the TSC will have to decide what to do to move things forward.

docs/README.md

@@ -0,0 +1,31 @@
+# Build instructions
+
+To build the docs you must use Python 3.11.
+
+To create a build environment run the following commands:
+```python
+python -m venv .venv
+source .venv/bin/activate
+pip install -r docs/requirements.txt
+
+cd docs
+make html
+```
+
+# Example Headers
+
+============
+page section
+============
+
+Section 1
+=========
+
+Section 1.1
+-----------
+
+Section 1.1.1
++++++++++++++
+
+Section 1.1.1.1
+***************

docs/source/configuring_rez.rst

@@ -26,6 +26,14 @@ variable :envvar:`REZ_CONFIG_FILE` is then set to for all your users.
    You do not need to provide a copy of all settings in this file. Just provide those
    that are changed from the defaults.
 
+Supported Configuration File Formats
+====================================
+
+Rez supports both YAML configuration files and Python configuration files.
+
+You may prefer a Python based configuration file if you need to vary your configuration settings based on your
+current platform.
+
 .. _configuring-rez-settings-merge-rules:
 
 Settings Merge Rules

src/rez/data/tests/solver/packages/missing_variant_requires/1/package.py

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright Contributors to the Rez Project
-
 name = "missing_variant_requires"
 version = "1"
 
@@ -10,4 +7,4 @@ def commands():
 variants = [
     ["noexist"],
     ["nada"]
-]
+]

src/rez/utils/_version.py

@@ -3,4 +3,5 @@
 
 
 # Update this value to version up Rez. Do not place anything else in this file.
-_rez_version = "2.113.0"
+# Using .devN allows us to run becnmarks and create proper benchmark reports on PRs.
+_rez_version = "2.113"