Fix dependency ordering

.github/workflows/release.yml

@@ -36,8 +36,8 @@ jobs:
     - name: Publish to crates.io
       run: |
         cargo login ${{ secrets.CRATES_IO_API_TOKEN }}
-        cargo publish -p chatdbg --allow-dirty
         cargo publish -p chatdbg_macros --allow-dirty
+        cargo publish -p chatdbg --allow-dirty
       working-directory: rust-support
 
     - name: Publish to PyPI

rust-support/chatdbg/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chatdbg"
-version = "0.0.0"                                       # Sync with pyproject.toml on release.
+version = "##VERSION##"                                 # Sync with pyproject.toml on release.
 edition = "2021"
 description = "Rust-specific support for ChatDBG."
 authors = ["Emery Berger <[email protected]>"]
@@ -10,5 +10,5 @@ homepage = "https://github.com/plasma-umass/ChatDBG/"
 repository = "https://github.com/plasma-umass/ChatDBG/"
 
 [dependencies]
-chatdbg_macros = { path = "../chatdbg_macros" }
+chatdbg_macros = "##VERSION##" # Sync with pyproject.toml on release.
 lazy_static = "1.4.0"

rust-support/chatdbg_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chatdbg_macros"
-version = "0.0.0"                                          # Sync with pyproject.toml on release.
+version = "##VERSION##"                                    # Sync with pyproject.toml on release.
 edition = "2021"
 description = "Rust-specific (macro) support for ChatDBG."
 authors = ["Noah Lev Bartell-Mangel <[email protected]>"]

rust-support/fill-crate-version.py

@@ -1,5 +1,6 @@
 import os
 import tomllib
+import re
 
 DIRNAME = os.path.dirname(__file__)
 PYPROJECT_FILE = os.path.join(DIRNAME, "../pyproject.toml")
@@ -14,10 +15,7 @@
         version = tomllib.load(f)["project"]["version"]
     for file in CARGO_TOML_FILES:
         with open(file, "r") as f:
-            lines = f.readlines()
+            content = f.read()
+        content = re.sub(r"##VERSION##", version, content)
         with open(file, "w") as f:
-            for line in lines:
-                if line.startswith("version"):
-                    f.write(f'version = "{version}"\n')
-                else:
-                    f.write(line)
+            f.write(content)