Skip to content

Commit

Permalink
Merge pull request #1218 from CQCL/release/1.24.0
Browse files Browse the repository at this point in the history
Release/1.24.0
  • Loading branch information
cqc-alec authored Jan 16, 2024
2 parents 8cac679 + 00c3ab6 commit 273c558
Show file tree
Hide file tree
Showing 874 changed files with 1,085 additions and 1,070 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-docs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2019-2023 Cambridge Quantum Computing
# Copyright 2019-2024 Cambridge Quantum Computing
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-with-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v24
- uses: cachix/install-nix-action@v25
- name: Build and test tket
run: nix flake check -L
16 changes: 8 additions & 8 deletions .github/workflows/build-without-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ jobs:
- name: Install catch2
run: |
cd ${TMP_DIR}
wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.0.tar.gz
tar xzvf v3.5.0.tar.gz
cd Catch2-3.5.0/
wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.1.tar.gz
tar xzvf v3.5.1.tar.gz
cd Catch2-3.5.1/
mkdir build
cd build
cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand All @@ -85,9 +85,9 @@ jobs:
- name: Install rapidcheck
run: |
cd ${TMP_DIR}
wget https://github.com/emil-e/rapidcheck/archive/8fafda42e732164db58003e542196e94a28481f9.zip
unzip 8fafda42e732164db58003e542196e94a28481f9.zip
cd rapidcheck-8fafda42e732164db58003e542196e94a28481f9/
wget https://github.com/emil-e/rapidcheck/archive/1c91f40e64d87869250cfb610376c629307bf77d.zip
unzip 1c91f40e64d87869250cfb610376c629307bf77d.zip
cd rapidcheck-1c91f40e64d87869250cfb610376c629307bf77d/
mkdir build
cd build
cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand Down Expand Up @@ -189,10 +189,10 @@ jobs:
cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_RPATH="\${ORIGIN}" ..
cmake --build . -j2
cmake --install .
- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: '3.11'
- name: Install pytket
run: |
cd pytket
Expand Down
54 changes: 37 additions & 17 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- uses: dorny/paths-filter@v2.11.1
id: filter
with:
Expand Down Expand Up @@ -104,11 +104,11 @@ jobs:
- name: apt update
if: matrix.os == 'ubuntu-22.04'
run: sudo apt update
- name: Select Python 3.10
- name: Select Python 3.11
# otherwise turtlebrowser/get-conan@v1.2 fails on macos-12
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- name: Install conan
uses: turtlebrowser/get-conan@v1.2
- name: Set up conan
Expand Down Expand Up @@ -262,21 +262,27 @@ jobs:
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: '3.10'
- name: Set up Python (push)
if: github.event_name == 'push'
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: '3.11'
- name: Set up Python (schedule)
if: github.event_name == 'schedule'
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: '3.12'
- name: Build pytket
if: github.event_name != 'schedule'
run: |
cd pytket
pip install -e .[ZX] -v
- name: Build pytket
if: github.event_name == 'schedule' # https://github.com/CQCL/tket/issues/1200
run: |
cd pytket
pip install -e -v
- name: Run doctests
run: |
cd pytket
Expand Down Expand Up @@ -328,11 +334,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Select Python 3.10
- name: Select Python 3.11
# otherwise turtlebrowser/get-conan@v1.2 fails on macos-12
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- name: Install conan
uses: turtlebrowser/get-conan@v1.2
- name: Set up conan
Expand Down Expand Up @@ -367,21 +373,29 @@ jobs:
conan create recipes/pybind11_json/all --version 0.2.13
- name: Set up Python (pull request)
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
run: brew install python@3.9
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Set up Python (push)
if: github.event_name == 'push'
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: '3.11'
- name: Set up Python (schedule)
if: github.event_name == 'schedule'
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: '3.12'
- name: Build pytket
if: github.event_name != 'schedule'
run: |
cd pytket
python${{ matrix.python-version }} -m pip install -e .[ZX] -v
- name: Build pytket
if: github.event_name == 'schedule' # https://github.com/CQCL/tket/issues/1200
run: |
cd pytket
python${{ matrix.python-version }} -m pip install -e -v
- name: Run doctests
run: |
cd pytket
Expand Down Expand Up @@ -484,25 +498,31 @@ jobs:
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.13
- name: Set up Python (3.9)
- name: Set up Python 3.10
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Set up Python (3.10)
python-version: '3.10'
- name: Set up Python 3.11
if: github.event_name == 'push'
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Set up Python (3.11)
python-version: '3.11'
- name: Set up Python 3.12
if: github.event_name == 'schedule'
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: '3.12'
- name: Build pytket
if: github.event_name != 'schedule'
run: |
cd pytket
pip install -e .[ZX] -v
- name: Build pytket
if: github.event_name == 'schedule' # https://github.com/CQCL/tket/issues/1200
run: |
cd pytket
pip install -e -v
- name: Run doctests
run: |
cd pytket
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_libs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ jobs:
$normalized_file = [IO.File]::ReadAllText($f) -replace "`r`n", "`n"
[IO.File]::WriteAllText($f, $normalized_file)
}
- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- name: Install conan
uses: turtlebrowser/get-conan@v1.2
- name: Set up conan
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compare-coverage
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright 2019-2023 Cambridge Quantum Computing
# Copyright 2019-2024 Cambridge Quantum Computing
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compare-pytket-coverage
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright 2019-2023 Cambridge Quantum Computing
# Copyright 2019-2024 Cambridge Quantum Computing
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linuxbuildlib
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2019-2023 Cambridge Quantum Computing
# Copyright 2019-2024 Cambridge Quantum Computing
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,7 +17,7 @@
set -evu

# Choose a Python to install conan
export PYBIN=/opt/python/cp39-cp39/bin
export PYBIN=/opt/python/cp310-cp310/bin

${PYBIN}/pip install --upgrade pip
${PYBIN}/pip install conan~=2.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linuxbuildpackages
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2019-2023 Cambridge Quantum Computing
# Copyright 2019-2024 Cambridge Quantum Computing
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linuxbuildwheel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2019-2023 Cambridge Quantum Computing
# Copyright 2019-2024 Cambridge Quantum Computing
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linuxtestwheel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2019-2023 Cambridge Quantum Computing
# Copyright 2019-2024 Cambridge Quantum Computing
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:

- uses: actions/checkout@v4

- name: Select Python 3.10
- name: Select Python 3.11
# otherwise turtlebrowser/get-conan@v1.2 fails on macos-12
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'

- name: Install conan
uses: turtlebrowser/get-conan@v1.2
Expand Down
Loading

0 comments on commit 273c558

Please sign in to comment.