CI - activate Python 3.13 tests for all platforms (#7489)

- Activate Python 3.13 tests for all platforms

- CI - combine `pytest-numpy-2` with `pytest` (Ubuntu).
  Include `cirq/contrib` tests which were tested in `pytest-numpy-2`
  and do not take too much extra time.

Finalizes #6706 and #7296

Author: pavoljuhas

.github/workflows/ci-daily.yml

@@ -18,7 +18,7 @@ jobs:
     name: Pytest Ubuntu
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -44,7 +44,7 @@ jobs:
     name: Pytest Windows
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
     runs-on: windows-2022
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -70,7 +70,7 @@ jobs:
     name: Pytest MacOS
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
     runs-on: macos-13
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

.github/workflows/ci.yml

@@ -187,7 +187,7 @@ jobs:
     name: Pytest Ubuntu
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
     runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
@@ -205,32 +205,6 @@ jobs:
         run: |
           pip install --upgrade setuptools wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
-      - name: Pytest check
-        run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
-  # TODO(#6706) remove after we start using NumPy 2.0 in regular pytest
-  pytest-numpy-2:
-    if: github.repository_owner == 'quantumlib'
-    name: Pytest Ubuntu with NumPy-2
-    strategy:
-      matrix:
-        python-version: ['3.11', '3.12', '3.13']
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Check out source repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Set up Python environment
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          architecture: 'x64'
-          cache: 'pip'
-          cache-dependency-path: |
-            **/requirements.txt
-            dev_tools/requirements/**/*.txt
-      - name: Install requirements
-        run: |
-          pip install wheel
-          pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev-np2.env.txt
       - name: Pytest check
         run: check/pytest -n auto --durations=20
   pip-compile:
@@ -302,7 +276,7 @@ jobs:
     name: Pytest Windows
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
     runs-on: windows-2022
     steps:
       - name: Check out source repository
@@ -330,7 +304,7 @@ jobs:
     name: Pytest MacOS
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
     runs-on: macos-13
     steps:
       - name: Check out source repository

dev_tools/requirements/dev-np2.env.txt

@@ -4,4 +4,3 @@
 
 -r deps/cirq-all.txt
 -r deps/dev-tools.txt
-