Merge branch 'master' into mh-add-editorconfig

Author: mhucka

.github/problem-matchers/yamllint.json

@@ -0,0 +1,22 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "yamllint",
+      "pattern": [
+        {
+          "regexp": "^(.*\\.ya?ml)$",
+          "file": 1
+        },
+        {
+          "regexp": "^\\s{2}(\\d+):(\\d+)\\s+(error|warning)\\s+(.*?)\\s+\\((.*)\\)$",
+          "line": 1,
+          "column": 2,
+          "severity": 3,
+          "message": 4,
+          "code": 5,
+          "loop": true
+        }
+      ]
+    }
+  ]
+}

.github/workflows/ci-build-checks.yaml

@@ -169,7 +169,7 @@ jobs:
   Setup:
     if: needs.Decision.outputs.need_run == 'true'
     needs: Decision
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 15
     outputs:
       python_cache_key: ${{steps.parameters.outputs.python_cache_key}}
@@ -266,7 +266,7 @@ jobs:
     if: needs.Decision.outputs.need_run == 'true'
     name: Build Python wheel
     needs: [Decision, Setup]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out a copy of the TFQ git repository
         uses: actions/checkout@v4
@@ -335,7 +335,7 @@ jobs:
     if: needs.Decision.outputs.need_run == 'true'
     name: Test the Python wheel
     needs: [Decision, Setup, Build_wheel]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out a copy of the TFQ git repository
         uses: actions/checkout@v4
@@ -371,7 +371,7 @@ jobs:
     if: needs.Decision.outputs.need_run == 'true'
     name: Test the rest of TFQ
     needs: [Decision, Setup, Build_wheel]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out a copy of the TFQ git repository
         uses: actions/checkout@v4
@@ -424,7 +424,7 @@ jobs:
   Tutorial_tests:
     if: needs.Decision.outputs.need_run == 'true'
     name: Test the tutorials
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [Decision, Setup, Build_wheel]
     steps:
       - name: Check out a copy of the TFQ git repository
@@ -470,7 +470,7 @@ jobs:
     if: failure() || needs.setup.outputs.debug == 'true'
     name: Print debugging info
     needs: [Decision, Setup, Build_wheel, Bazel_tests]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out a copy of the TFQ git repository
         uses: actions/checkout@v4

.github/workflows/ci-file-checks.yaml

@@ -79,6 +79,8 @@ jobs:
       python_files: ${{steps.filter.outputs.python_files}}
       cc: ${{steps.filter.outputs.cc}}
       cc_files: ${{steps.filter.outputs.cc_files}}
+      yaml: ${{steps.filter.outputs.yaml}}
+      yaml_files: ${{steps.filter.outputs.yaml_files}}
     steps:
       # When invoked manually, use the given SHA to figure out the change list.
       - if: github.event_name == 'workflow_dispatch'
@@ -125,6 +127,10 @@ jobs:
                   - '**/*.cc'
                   - '**/*.h'
                   - '**/*.proto'
+            yaml:
+              - added|modified:
+                  - '**/*.yaml'
+                  - '**/*.yml'
 
   Setup:
     if: needs.Changes.outputs.python == 'true'
@@ -336,3 +342,27 @@ jobs:
             } >> "$GITHUB_STEP_SUMMARY"
           fi
           exit $exit_code
+
+  Yaml-lint:
+    if: needs.Changes.outputs.yaml == 'true'
+    name: YAML lint
+    needs: Changes
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check out a copy of the TFQ git repository
+        uses: actions/checkout@v4
+
+      - name: Set up yamllint output problem matcher
+        run: echo '::add-matcher::.github/problem-matchers/yamllint.json'
+
+      - name: Find out the yamllint version
+        id: yamllint
+        run: |
+          version=$(yamllint --version)
+          echo "version=${version#yamllint }" >> "$GITHUB_OUTPUT"
+
+      - name: Run yamllint ${{steps.yamllint.outputs.version}}
+        run: |
+          set -x
+          # shellcheck disable=SC2086
+          yamllint --format github ${{needs.Changes.outputs.yaml_files}}

.github/workflows/ci-nightly-build-test.yaml

@@ -76,7 +76,7 @@ jobs:
     if: needs.Decision.outputs.run == 'true'
     name: Build and test
     needs: Decision
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out a copy of the TFQ git repository
         uses: actions/checkout@v4

.github/workflows/ci-nightly-cirq-test.yaml

@@ -33,12 +33,12 @@ on:
         type: string
         default: "x64"
 
-      use_bazel_disk_cache:
+      use_disk_cache:
         description: Use Bazel disk_cache between runs
         type: boolean
         default: true
 
-      cache_bazel_tests:
+      use_test_cache:
         description: Allow Bazel to cache test results
         type: boolean
         default: true
@@ -72,7 +72,7 @@ concurrency:
 jobs:
   test-compatibility:
     name: Run TFQ tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out a copy of the TFQ git repository
         uses: actions/checkout@v4
@@ -92,27 +92,29 @@ jobs:
 
       - name: Install the nightly build version of Cirq
         run: |
+          echo 'numpy<2.0.0' > constraint.txt
+          export PIP_CONSTRAINT=constraint.txt
           pip install -U cirq --pre
 
       - name: Configure Bazel options
         run: |
           # If we didn't get a cache hit on the installed Python environment,
           # something's changed, and we want to make sure to re-run all tests.
           if [[ "${{steps.python.outputs.cache-hit}}" == "true"
-                 && "${{github.event.inputs.cache_bazel_tests}}" != "false" ]]; then
-            echo "cache_bazel_tests=auto" >> "$GITHUB_ENV"
+                && "${{github.event.inputs.use_test_cache}}" != "false" ]]; then
+            echo "use_test_cache=auto" >> "$GITHUB_ENV"
           else
-            echo "cache_bazel_tests=no" >> "$GITHUB_ENV"
+            echo "use_test_cache=no" >> "$GITHUB_ENV"
           fi
           # Use the disk cache unless told not to.
-          if [[ "${{github.event.inputs.use_bazel_disk_cache}}" != "false" ]]; then
-            echo "use_bazel_disk_cache=true" >> "$GITHUB_ENV"
+          if [[ "${{github.event.inputs.use_disk_cache}}" != "false" ]]; then
+            echo "use_disk_cache=true" >> "$GITHUB_ENV"
           else
-            echo "use_bazel_disk_cache=false" >> "$GITHUB_ENV"
+            echo "use_disk_cache=false" >> "$GITHUB_ENV"
           fi
 
       - name: Set up Bazel with caching
-        if: env.use_bazel_disk_cache == 'true'
+        if: env.use_disk_cache == 'true'
         uses: bazel-contrib/[email protected]
         env:
           USE_BAZEL_VERSION: ${{inputs.bazel_version || env.bazel_version}}
@@ -123,17 +125,17 @@ jobs:
           repository-cache: true
           bazelrc: |
             ${{env.bazelrc_additions}}
-            test --cache_test_results=${{env.cache_bazel_tests}}
+            test --cache_test_results=${{env.use_test_cache}}
 
       - name: Set up Bazel without caching
-        if: env.use_bazel_disk_cache == 'false'
+        if: env.use_disk_cache == 'false'
         uses: bazel-contrib/[email protected]
         env:
           USE_BAZEL_VERSION: ${{inputs.bazel_version || env.bazel_version}}
         with:
           bazelrc: |
             ${{env.bazelrc_additions}}
-            test --cache_test_results=${{env.cache_bazel_tests}}
+            test --cache_test_results=${{env.use_test_cache}}
 
       - name: Configure TFQ
         run: |

.yamllint.yaml

@@ -0,0 +1,10 @@
+# Summary: yamllint configuration for TensorFlow Quantum.
+# See https://yamllint.readthedocs.io/ for info about configuration options.
+
+rules:
+  line-length:
+    # A common occurrence in YAML files is long URLs. The next two settings are
+    # not specific to URLs, but help. It saves developer time by not requiring
+    # comment directives to disable warnings at every occurrence.
+    allow-non-breakable-words: true
+    allow-non-breakable-inline-mappings: true