rename vendoring folder

deadsoul44 · deadsoul44 · commit 4e0a722bd796 · 2026-01-25T21:13:29.000+03:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -96,7 +96,7 @@ jobs:
           python-version: ${{ matrix.pyversion }}
           architecture: x64
       - name: Install deps
-        run: pip install numpy pandas seaborn scikit-learn toml
+        run: pip install numpy pandas seaborn scikit-learn toml requests
       - run: |
           cp README.md package-python/README.md
           cp LICENSE package-python/LICENSE
@@ -132,7 +132,7 @@ jobs:
           python-version: ${{ matrix.pyversion }}
           architecture: arm64
       - name: Install deps
-        run: pip install numpy pandas seaborn scikit-learn toml
+        run: pip install numpy pandas seaborn scikit-learn toml requests
       - run: |
           cp README.md package-python/README.md
           cp LICENSE package-python/LICENSE
@@ -174,10 +174,12 @@ jobs:
           r-version: 'release'
           
       - uses: r-lib/actions/setup-pandoc@v2
+        
+      - name: Install Python Requests
+        run: pip install requests
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::rcmdcheck, any::devtools
           working-directory: package-r
           use-public-rspm: true
           cache: true
@@ -194,14 +196,14 @@ jobs:
           # Run check on the built tarball
           tarball=$(ls perpetual_*.tar.gz)
           echo "Checking $tarball"
-          Rscript -e "rcmdcheck::rcmdcheck(path = '$tarball', args = c('--as-cran', '--no-tests', '--no-manual', '--no-vignettes'), error_on = 'error')"
+          R CMD check --as-cran --no-tests --no-manual --no-vignettes "$tarball"
           
       - name: Submit to CRAN
         if: github.event.release.prerelease == false
         run: |
           tarball=$(ls perpetual_*.tar.gz)
           echo "Submitting $tarball to CRAN"
-          Rscript -e "devtools::submit_cran(pkg = '$tarball')"
+          python scripts/submit_cran.py "$tarball"
           
       - name: Upload Release Asset
         if: github.event_name == 'release'
diff --git a/.gitignore b/.gitignore
@@ -41,9 +41,8 @@ typescript
 wsl_*.sh
 
 # Rust vendoring artifacts
-package-r/src/rust/.cargo/
-package-r/inst/vendor/
-package-r/inst/cargo_home/
+package-r/inst/v/
+package-r/inst/c/
 package-r/src/rust/core/
 
 # Python cache
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "perpetual"
-version = "1.0.16"
+version = "1.0.17"
 edition = "2021"
 authors = ["Mutlu Simsek <msimsek@perpetual-ml.com>", "Serkan Korkmaz <serkor1@duck.com>", "Pieter Pel <pelpieter@gmail.com>"]
 homepage = "https://perpetual-ml.com"
diff --git a/package-python/Cargo.toml b/package-python/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "py-perpetual"
-version = "1.0.16"
+version = "1.0.17"
 edition = "2021"
 authors = ["Mutlu Simsek <msimsek@perpetual-ml.com>", "Serkan Korkmaz <serkor1@duck.com>", "Pieter Pel <pelpieter@gmail.com>"]
 homepage = "https://perpetual-ml.com"
@@ -18,7 +18,7 @@ name = "perpetual"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-perpetual_rs = {package="perpetual", version = "1.0.16", path = "../" }
+perpetual_rs = {package="perpetual", version = "1.0.17", path = "../" }
 pyo3 = { version = "0.27.2", features = ["extension-module"] }
 numpy = "0.27.1"
 ndarray = "0.17.2"
diff --git a/package-python/docs/source/conf.py b/package-python/docs/source/conf.py
@@ -10,7 +10,7 @@
 author = "Mutlu Simsek, Serkan Korkmaz, Pieter Pel"
 
 # The full version, including alpha/beta/rc tags
-release = "1.0.16"
+release = "1.0.17"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/package-python/pyproject.toml b/package-python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "perpetual"
-version = "1.0.16"
+version = "1.0.17"
 description = "A self-generalizing gradient boosting machine that doesn't need hyperparameter optimization"
 keywords = [
   "rust",
diff --git a/package-python/uv.lock b/package-python/uv.lock
diff --git a/package-r/DESCRIPTION b/package-r/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: perpetual
 Type: Package
 Title: PerpetualBooster
-Version: 1.0.16
+Version: 1.0.17
 Authors@R: c(
     person("Mutlu", "Simsek", email = "msimsek@perpetual-ml.com", role = c("aut", "cre")),
     person("Serkan", "Korkmaz", email = "serkor1@duck.com", role = "aut"),
diff --git a/package-r/src/Makevars b/package-r/src/Makevars
@@ -7,7 +7,7 @@ $(SHLIB): $(STATLIB)
 $(STATLIB):
 	@echo "Building Rust library for Unix/macOS..."
 	rustc --version
-	cd rust && CARGO_HOME=../../inst/cargo_home cargo build --release --lib --verbose
+	cd rust && CARGO_HOME=../../inst/c cargo build --release --lib --verbose
 
 clean:
 	rm -rf rust/target
diff --git a/package-r/src/Makevars.win b/package-r/src/Makevars.win
@@ -8,7 +8,7 @@ all: rust-target
 rust-target:
 	@echo "Building Rust library for Windows (target: $(TARGET))..."
 	rustc --version
-	cd rust && CARGO_HOME=../../inst/cargo_home cargo build --release --lib --manifest-path Cargo.toml --target $(TARGET) --verbose
+	cd rust && CARGO_HOME=../../inst/c cargo build --release --lib --manifest-path Cargo.toml --target $(TARGET) --verbose
 	@if [ -f rust/target/$(TARGET)/release/libperpetual_r.a ]; then \
 		cp rust/target/$(TARGET)/release/libperpetual_r.a .; \
 	else \
diff --git a/package-r/src/rust/Cargo.toml b/package-r/src/rust/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "perpetual_r"
-version = "1.0.16"
+version = "1.0.17"
 edition = "2021"
 
 [lib]
diff --git a/scripts/increment_version.py b/scripts/increment_version.py
@@ -3,7 +3,7 @@
 import subprocess
 from pathlib import Path
 
-# python scripts/increment_version.py 1.0.16 --dry-run
+# python scripts/increment_version.py 1.0.17 --dry-run
 
 
 def update_file(file_path, pattern, replacement, dry_run=False):
diff --git a/scripts/submit_cran.py b/scripts/submit_cran.py
@@ -0,0 +1,107 @@
+import os
+import re
+import sys
+
+import requests
+
+
+def parse_description(package_dir):
+    """Parses DESCRIPTION file for package name, version, and maintainer."""
+    desc_path = os.path.join(package_dir, "DESCRIPTION")
+    with open(desc_path, "r", encoding="utf-8") as f:
+        content = f.read()
+
+    pkg = re.search(r"^Package:\s*(.+)", content, re.MULTILINE).group(1)
+    version = re.search(r"^Version:\s*(.+)", content, re.MULTILINE).group(1)
+
+    maintainer_match = re.search(
+        r"Maintainer:\s*([^<]+)<([^>]+)>", content, re.MULTILINE
+    )
+    if not maintainer_match:
+        # Try Authors@R
+        authors_match = re.search(
+            r"Authors@R:\s*(.+)", content, re.MULTILINE | re.DOTALL
+        )
+        if authors_match:
+            # Very basic parsing of Authors@R to find maintainer
+            # Looking for role = "cre" or role = c(..., "cre", ...)
+            authors = authors_match.group(1)
+            # This is a bit fragile but covers standard cases
+            cre_match = re.search(
+                r'person\("([^"]+)",\s*"([^"]+)",\s*email\s*=\s*"([^"]+)",.*role.*"cre"',
+                authors,
+            )
+            if cre_match:
+                name = f"{cre_match.group(1)} {cre_match.group(2)}"
+                email = cre_match.group(3)
+            else:
+                raise ValueError("Could not find Maintainer in DESCRIPTION")
+        else:
+            raise ValueError("Could not find Maintainer in DESCRIPTION")
+    else:
+        name = maintainer_match.group(1).strip()
+        email = maintainer_match.group(2).strip()
+
+    print(f"Detected Package: {pkg} {version}")
+    print(f"Detected Maintainer: {name} <{email}>")
+
+    return pkg, version, name, email
+
+
+def submit_cran(tarball_path, package_dir):
+    pkg, version, name, email = parse_description(package_dir)
+
+    # Read comment
+    comment = f"Releasing version {version}"
+    if os.path.exists("cran-comments.md"):
+        with open("cran-comments.md", "r", encoding="utf-8") as f:
+            comment = f.read()
+
+    url = "https://xmpalantir.wu.ac.at/cransubmit/index2.php"
+
+    files = {
+        "pkg": (
+            os.path.basename(tarball_path),
+            open(tarball_path, "rb"),
+            "application/x-gzip",
+        ),
+    }
+
+    data = {
+        "pkg_id": "",
+        "name": name,
+        "email": email,
+        "policy_check": "1",  # "I have read and agree to the CRAN policies"
+        "comment": comment,
+        "upload": "Upload the package",
+    }
+
+    print(f"Submitting {tarball_path} to CRAN...")
+    try:
+        response = requests.post(url, files=files, data=data)
+        response.raise_for_status()
+
+        # Check for success message in response
+        if "The following package has been uploaded:" in response.text:
+            print("Submission successful!")
+            print("Check your email for the confirmation link.")
+        else:
+            print("Submission might have failed. Response content:")
+            print(response.text)
+            sys.exit(1)
+
+    except Exception as e:
+        print(f"Error submitting to CRAN: {e}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print("Usage: python submit_cran.py <tarball_path>")
+        sys.exit(1)
+
+    tarball = sys.argv[1]
+    # Assuming script is run from project root and package-r is there
+    package_dir = "package-r"
+
+    submit_cran(tarball, package_dir)
diff --git a/scripts/vendor_r.py b/scripts/vendor_r.py
@@ -76,22 +76,30 @@ def vendor_r():
 
 def vendor_dependencies(project_root):
     rust_dir = os.path.join(project_root, "package-r", "src", "rust")
-    vendor_dir = os.path.join(project_root, "package-r", "inst", "vendor")
-    config_dir = os.path.join(project_root, "package-r", "inst", "cargo_home")
+    # Use short paths to avoid 100 char limit for tarball
+    vendor_dir = os.path.join(project_root, "package-r", "inst", "v")
+    config_dir = os.path.join(project_root, "package-r", "inst", "c")
     config_file = os.path.join(config_dir, "config.toml")
 
     # Clean up old .cargo directory in rust_dir if it exists
     old_config_dir = os.path.join(rust_dir, ".cargo")
     if os.path.exists(old_config_dir):
         shutil.rmtree(old_config_dir)
 
+    # Clean up old vendor locations to avoid confusion/bloat
+    for old in ["inst/vendor", "inst/cargo_home", "v"]:
+        old_path = os.path.join(project_root, "package-r", old)
+        if os.path.exists(old_path):
+            shutil.rmtree(old_path)
+
     print(f"Vendoring dependencies into {vendor_dir}...")
 
     # Run cargo vendor
     # We must run this in the directory containing the Cargo.toml (package-r/src/rust)
     try:
-        result = subprocess.run(
-            ["cargo", "vendor", "../../inst/vendor"],
+        # We vendor to the short path
+        subprocess.run(
+            ["cargo", "vendor", "../../inst/v"],
             cwd=rust_dir,
             capture_output=True,
             text=True,
@@ -101,15 +109,23 @@ def vendor_dependencies(project_root):
         print(f"Error running cargo vendor: {e.stderr}")
         raise e
 
-    # Create .cargo/config.toml with the output from cargo vendor
+    # Create config.toml
     if not os.path.exists(config_dir):
         os.makedirs(config_dir)
 
-    # The output from cargo vendor is relative to the cwd where it was run
-    # Since we run it in rust_dir (package-r/src/rust) and vendor into "../../v" (package-r/v)
-    # The config should point to "../../v"
+    # We manually write the config to ensure the relative path is correct.
+    # config.toml will be in package-r/inst/c/config.toml
+    # vendor will be in package-r/inst/v
+    # So relative path is "../v"
+
+    config_content = """[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "../v"
+"""
     with open(config_file, "w", encoding="utf-8") as f:
-        f.write(result.stdout)
+        f.write(config_content)
 
     print(f"Created {config_file}")
 
