Merge pull request #53 from mtshiba/download-deps-v2

feat: auto-copy missing dependencies

.github/workflows/release.yml

@@ -30,12 +30,12 @@ jobs:
     strategy:
       matrix:
         include:
-          # - target: armv7-unknown-linux-gnueabihf
-          #   os: ubuntu-latest
-          # - target: aarch64-unknown-linux-gnu
-          #   os: ubuntu-latest
-          # - target: aarch64-apple-darwin
-          #   os: macos-latest
+          - target: armv7-unknown-linux-gnueabihf
+            os: ubuntu-latest
+          - target: aarch64-unknown-linux-gnu
+            os: ubuntu-latest
+          - target: aarch64-apple-darwin
+            os: macos-latest
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
           - target: x86_64-apple-darwin
@@ -47,14 +47,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
       - name: setup-tools
         run: |
           rustup update stable
-          rustup target add ${{ matrix.target }}
-          pip3 install maturin
+          pip3 install twine build
+        # rustup target add ${{ matrix.target }}
       - name: upload
         run: |
-          maturin publish -u mtshiba -p ${{ secrets.PYPI_PASSWORD }} --target ${{ matrix.target }} --skip-existing
+          cargo build --release
+          python3 -m build --wheel
+          twine upload -u mtshiba -p ${{ secrets.PYPI_PASSWORD }} dist/*
+        # maturin publish -u mtshiba -p ${{ secrets.PYPI_PASSWORD }} --target ${{ matrix.target }} --skip-existing
   upload-assets:
     needs: create-release
     strategy:

README.md

@@ -10,6 +10,12 @@
 
 ## Installation
 
+### pip
+
+```bash
+pip install pylyzer
+```
+
 ### cargo (rust package manager)
 
 ```bash
@@ -25,18 +31,6 @@ cargo install --path .
 
 Make sure that `cargo/rustc` is up-to-date, as pylyzer may be written with the latest language features.
 
-### pip
-
-```bash
-pip install pylyzer
-```
-
-__If installed this way, you also need to [install Erg](https://github.com/mtshiba/ergup).__
-
-```bash
-curl -L https://github.com/mtshiba/ergup/raw/main/ergup.py | python3
-```
-
 ### [GitHub Releases](https://github.com/mtshiba/pylyzer/releases/latest)
 
 ## What is the advantage over pylint, pyright, pytype, etc.?

pyproject.toml

@@ -1,15 +1,2 @@
 [build-system]
-requires = ["maturin>=0.12"]
-build-backend = "maturin"
-
-[project]
-name = "pylyzer"
-description = "A fast static code analyzer & language server for Python"
-requires-python = ">=3.7"
-classifiers = [
-    "Development Status :: 2 - Pre-Alpha",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python",
-    "Programming Language :: Rust",
-    "Topic :: Software Development :: Quality Assurance",
-]
+requires = ["setuptools", "setuptools-rust", "wheel"]

setup.py

@@ -0,0 +1,72 @@
+from pathlib import Path
+import os
+import shlex
+from glob import glob
+import tomllib
+import shutil
+
+from setuptools import setup, Command
+from setuptools_rust import RustBin
+
+class Clean(Command):
+    user_options = []
+    def initialize_options(self):
+        pass
+    def finalize_options(self):
+        pass
+    def run(self):
+        # super().run()
+        for d in ["build", "dist", "src/pylyzer.egg-info"]:
+            shutil.rmtree(d, ignore_errors=True)
+
+with open("README.md", encoding="utf-8", errors="ignore") as fp:
+    long_description = fp.read()
+
+with open("Cargo.toml", "rb") as fp:
+    toml = tomllib.load(fp)
+    name = toml["package"]["name"]
+    description = toml["package"]["description"]
+    version = toml["workspace"]["package"]["version"]
+    license = toml["workspace"]["package"]["license"]
+    url = toml["workspace"]["package"]["repository"]
+
+cargo_args = ["--no-default-features"]
+
+home = os.path.expanduser("~")
+file_and_dirs = glob(".erg/lib/**", recursive=True, root_dir=home)
+paths = [Path(home + "/" + path) for path in file_and_dirs if os.path.isfile(home + "/" + path)]
+files = [(str(path).removesuffix("/" + path.name).removeprefix(home), str(path)) for path in paths]
+data_files = {}
+for key, value in files:
+    if key in data_files:
+        data_files[key].append(value)
+    else:
+        data_files[key] = [value]
+data_files = list(data_files.items())
+
+setup(
+    name=name,
+    author="mtshiba",
+    author_email="sbym1346@gmail.com",
+    url=url,
+    description=description,
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    version=version,
+    license=license,
+    python_requires=">=3",
+    rust_extensions=[
+        RustBin("pylyzer", args=cargo_args, cargo_manifest_args=["--locked"])
+    ],
+    cmdclass={
+        "clean": Clean,
+    },
+    classifiers=[
+        "Development Status :: 2 - Pre-Alpha",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Rust",
+        "Topic :: Software Development :: Quality Assurance",
+    ],
+    data_files=data_files,
+)

src/copy.rs

@@ -0,0 +1,38 @@
+use std::path::Path;
+use std::fs::{copy, read_dir, create_dir_all};
+
+use erg_common::env::{erg_path, python_site_packages};
+
+fn copy_dir(from: impl AsRef<Path>, to: impl AsRef<Path>) -> std::io::Result<()> {
+    let from = from.as_ref();
+    let to = to.as_ref();
+    if !from.exists() {
+        return Ok(());
+    }
+    if !to.exists() {
+        create_dir_all(to)?;
+    }
+    for entry in read_dir(from)? {
+        let entry = entry?;
+        if entry.file_type()?.is_dir() {
+            copy_dir(entry.path(), to.join(entry.file_name()))?;
+        } else {
+            copy(entry.path(), to.join(entry.file_name()))?;
+        }
+    }
+    Ok(())
+}
+
+#[allow(unused)]
+pub(crate) fn copy_dot_erg() {
+    if erg_path().exists() {
+        return;
+    }
+    for site_packages in python_site_packages() {
+        if site_packages.join(".erg").exists() {
+            println!("Copying site-package/.erg to {}", erg_path().display());
+            copy_dir(site_packages.join(".erg"), erg_path())
+                .expect("Failed to copy .erg");
+        }
+    }
+}

src/lib.rs

@@ -1,5 +1,6 @@
 mod analyze;
 mod config;
 mod handle_err;
+mod copy;
 
 pub use analyze::PythonAnalyzer;

src/main.rs

@@ -1,13 +1,17 @@
 mod analyze;
 mod config;
 mod handle_err;
+mod copy;
 
 use analyze::{PythonAnalyzer, SimplePythonParser};
 use els::Server;
 use erg_common::config::ErgMode;
 use erg_common::spawn::exec_new_thread;
 
+use crate::copy::copy_dot_erg;
+
 fn run() {
+    copy_dot_erg();
     let cfg = config::parse_args();
     if cfg.mode == ErgMode::LanguageServer {
         let mut lang_server = Server::<PythonAnalyzer, SimplePythonParser>::new(cfg, None);