chore!: Update to next version of hugr (#720)

Updates the dependencies to `hugr-rs 0.14` and `hugr-py 0.10`. Now that hugrs carry their required extensions, we dropped the (internal) `extensions` field from the `Circuit` struct. BREAKING CHANGE: Updated `hugr` rust dependency to `0.14.0` BREAKING CHANGE: Extension are now defined in `hugr 0.14` style. Replaced the `ROTATION_TYPE` with a method call, and dropped the per-extension registry definitions. --------- Co-authored-by: Agustín Borgna <[email protected]> Co-authored-by: Agustín Borgna <[email protected]> Co-authored-by: Seyon Sivarajah <[email protected]>
CQCL · Dec 16, 2024 · 4a3a5a5 · 4a3a5a5
1 parent 9033daa
commit 4a3a5a5
Show file tree

Hide file tree

Showing 55 changed files with 1,215 additions and 1,111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,16 +26,18 @@ missing_docs = "warn"
 [patch.crates-io]
 
 # Uncomment to use unreleased versions of hugr
-hugr-core = { git = "https://github.com/CQCL/hugr.git" , rev = "7177c5f26c2ddf506d9987c84cf1899275d391d6"}
-hugr = { git = "https://github.com/CQCL/hugr.git" , rev = "7177c5f26c2ddf506d9987c84cf1899275d391d6"}
-hugr-cli = { git = "https://github.com/CQCL/hugr.git" , rev = "7177c5f26c2ddf506d9987c84cf1899275d391d6"}
+#hugr = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
+#hugr-core = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
+#hugr-passes = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
+#hugr-cli = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
+#hugr-model = { git = "https://github.com/CQCL/hugr", ref = "b517dc3530c3f01d854579e210da51d7a63e3036" }
 
 [workspace.dependencies]
 
 # Make sure to run `just recompile-eccs` if the hugr serialisation format changes.
-hugr = "0.13.3"
-hugr-core = "0.13.3"
-hugr-cli = "0.13.3"
+hugr = "0.14.0"
+hugr-core = "0.14.0"
+hugr-cli = "0.14.0"
 portgraph = "0.12"
 pyo3 = "0.23.3"
 itertools = "0.13.0"

diff --git a/devenv.lock b/devenv.lock
@@ -39,10 +39,10 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1733328505,
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -51,10 +51,32 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1733665616,
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "pre-commit-hooks",
+          "git-hooks",
           "nixpkgs"
         ]
       },
@@ -103,10 +125,10 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1728328465,
+        "lastModified": 1733730953,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c",
+        "rev": "7109b680d161993918b0a126f38bc39763e5a709",
         "type": "github"
       },
       "original": {
@@ -116,35 +138,16 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1728092656,
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "devenv": "devenv",
         "fenix": "fenix",
+        "git-hooks": "git-hooks",
         "nixpkgs": "nixpkgs",
         "nixpkgs-2305": "nixpkgs-2305",
-        "pre-commit-hooks": "pre-commit-hooks"
+        "pre-commit-hooks": [
+          "git-hooks"
+        ]
       }
     },
     "rust-analyzer-src": {

diff --git a/test_files/eccs/nam_4_2.rwr b/test_files/eccs/nam_4_2.rwr
diff --git a/test_files/eccs/nam_6_3.rwr b/test_files/eccs/nam_6_3.rwr
diff --git a/test_files/eccs/small_eccs.rwr b/test_files/eccs/small_eccs.rwr
diff --git a/tket2-eccs/src/tket2_eccs/data/nam_6_3.rwr b/tket2-eccs/src/tket2_eccs/data/nam_6_3.rwr
diff --git a/tket2-exts/pyproject.toml b/tket2-exts/pyproject.toml
@@ -26,9 +26,7 @@ classifiers = [
     "Topic :: Scientific/Engineering",
 ]
 
-dependencies = [
-    "hugr>=0.9.0",
-]
+dependencies = ['hugr >= 0.10.0, < 0.11']
 
 [project.urls]
 homepage = "https://github.com/CQCL/tket2/tree/main/tket2-exts"

diff --git a/tket2-exts/src/tket2_exts/data/tket2/futures.json b/tket2-exts/src/tket2_exts/data/tket2/futures.json
@@ -1,7 +1,7 @@
 {
   "version": "0.1.0",
   "name": "tket2.futures",
-  "extension_reqs": [],
+  "runtime_reqs": [],
   "types": {
     "Future": {
       "extension": "tket2.futures",
@@ -85,7 +85,7 @@
               "bound": "A"
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -121,7 +121,7 @@
             }
           ],
           "output": [],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -163,7 +163,7 @@
               "b": "A"
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false

diff --git a/tket2-exts/src/tket2_exts/data/tket2/qsystem.json b/tket2-exts/src/tket2_exts/data/tket2/qsystem.json
@@ -1,7 +1,7 @@
 {
   "version": "0.2.0",
   "name": "tket2.qsystem",
-  "extension_reqs": [
+  "runtime_reqs": [
     "arithmetic.float.types",
     "prelude",
     "tket2.futures"
@@ -42,7 +42,7 @@
               "bound": "A"
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -66,7 +66,7 @@
               "size": 2
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -93,7 +93,7 @@
               "size": 2
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -129,7 +129,7 @@
               "t": "Q"
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -147,7 +147,7 @@
             }
           ],
           "output": [],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -169,7 +169,7 @@
               "t": "Q"
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -198,7 +198,7 @@
               "t": "Q"
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -225,7 +225,7 @@
               ]
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -253,7 +253,7 @@
               "t": "Q"
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false
@@ -288,7 +288,7 @@
               "t": "Q"
             }
           ],
-          "extension_reqs": []
+          "runtime_reqs": []
         }
       },
       "binary": false