Pre-release (v3)

Author: habedi

.editorconfig

@@ -16,6 +16,10 @@ trim_trailing_whitespace = true # Remove trailing whitespace
 [*.rs]
 max_line_length = 100
 
+# Python files
+[*.py]
+max_line_length = 100
+
 # Markdown files
 [*.md]
 max_line_length = 120
@@ -29,3 +33,7 @@ indent_size = 2
 [*.{yaml,yml}]
 indent_size = 2
 
+# TOML files
+[*.toml]
+indent_size = 2
+

.github/workflows/publish_py.yml

@@ -0,0 +1,41 @@
+name: Publish to PyPI
+
+on:
+  workflow_dispatch: # Enable manual runs
+  push:
+    tags:
+      - 'v*' # Trigger on version tags
+
+jobs:
+
+  #  # Run tests before publishing
+  #  call_tests:
+  #    uses: ./.github/workflows/tests_py.yml
+
+  publish_to_pypi:
+    runs-on: ubuntu-latest
+    #    needs: call_tests
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set Up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install Poetry
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-pip make
+          pip install poetry
+
+      - name: Install Python Dependencies
+        run: |
+          poetry install --no-root
+
+      - name: Build and Publish Package
+        run: |
+          poetry run make wheel-manylinux
+          PYPI_TOKEN=${{ secrets.PYPI_API_TOKEN }} poetry run make publish_py

.gitignore

@@ -64,16 +64,14 @@ tmp/
 *.wal
 *.sqlite
 
-# Dependency lock files (uncomment to ignore)
-poetry.lock
-
 # Rust specific
 /target/
 .cargo-ok
 cobertura.xml
 tarpaulin-report.html
 
-# Comment out the next line if you want to checkin your lock file for Cargo
+# Dependency lock files (uncomment to ignore)
+poetry.lock
 Cargo.lock
 
 # Miscellaneous files and directories to ignore
@@ -82,3 +80,6 @@ Cargo.lock
 tmp_*
 temp_*
 output_*
+*.so
+.benchmarks/
+ci.yml

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "graphina"
-version = "0.2.0"
+version = "0.2.1"
 description = "A graph data science library for Rust"
 repository = "https://github.com/habedi/graphina"
 license = "MIT OR Apache-2.0"
@@ -16,28 +16,24 @@ rust-version = "1.83"
 resolver = "2"
 
 include = [
-    "docs/**/*",
-    "src/**/*",
-    "Cargo.toml",
-    "README.md",
-    "LICENSE-MIT",
-    "LICENSE-APACHE"
+  "docs/**/*",
+  "src/**/*",
+  "Cargo.toml",
+  "README.md",
+  "LICENSE-MIT",
+  "LICENSE-APACHE"
 ]
 
 [lib]
 name = "graphina"
 path = "src/lib.rs"
 
-[[bin]]
-name = "graphina"
-path = "src/main.rs"
-
 [features]
 default = []  # No features enabled by default
 binaries = []
 
 [dependencies]
-ctor = "0.2.9"
+ctor = "0.3.6"
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
 rand = "0.9.0"
@@ -61,3 +57,14 @@ lto = true
 
 [profile.bench]
 debug = true
+
+[package.metadata.rustfmt]
+max_width = 100
+hard_tabs = false
+tab_spaces = 4
+
+[workspace]
+members = [
+  ".",
+  "pygraphina"
+]

Makefile

@@ -6,75 +6,123 @@ PATH := /snap/bin:$(PATH)
 DEBUG_GRAPHINA = 1
 RUST_LOG = info
 RUST_BACKTRACE = full
+WHEEL_DIR = dist
+PYGRAPHINA_DIR = pygraphina
+
+# Find the built Python wheel file (the latest one)
+WHEEL_FILE = $(shell ls $(PYGRAPHINA_DIR)/$(WHEEL_DIR)/pygraphina-*.whl | head -n 1)
 
 # Default target
 .DEFAULT_GOAL := help
 
 .PHONY: help
-help: ## Show this help message
+help: ## Show the list of available targets with their descriptions
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
+########################################################################################
+## Rust targets
+########################################################################################
+
 .PHONY: format
 format: ## Format Rust files
 	@echo "Formatting Rust files..."
-	cargo fmt
+	@cargo fmt
 
 .PHONY: test
 test: format ## Run tests
 	@echo "Running tests..."
-	DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) RUST_LOG=debug RUST_BACKTRACE=$(RUST_BACKTRACE) cargo test -- --nocapture
+	@DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) RUST_LOG=debug RUST_BACKTRACE=$(RUST_BACKTRACE) cargo test -- --nocapture
 
 .PHONY: coverage
 coverage: format ## Generate test coverage report
 	@echo "Generating test coverage report..."
-	DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) cargo tarpaulin --out Xml --out Html
+	@DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) cargo tarpaulin --out Xml --out Html
 
 .PHONY: build
 build: format ## Build the binary for the current platform
 	@echo "Building the project..."
-	DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) cargo build --release
+	@DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) cargo build --release
 
 .PHONY: run
 run: build ## Build and run the binary
 	@echo "Running the $(BINARY) binary..."
-	DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) ./$(BINARY)
+	@DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) ./$(BINARY)
 
 .PHONY: clean
 clean: ## Remove generated and temporary files
 	@echo "Cleaning up..."
-	cargo clean
+	@cargo clean
+	@rm -rf dist/
+	@rm -rf $(PYGRAPHINA_DIR)/$(WHEEL_DIR)
+	@rm -f $(PYGRAPHINA_DIR)/*.so
 
 .PHONY: install-snap
 install-snap: ## Install a few dependencies using Snapcraft
 	@echo "Installing the snap package..."
-	sudo apt-get update
-	sudo apt-get install -y snapd
-	sudo snap refresh
-	sudo snap install rustup --classic
+	@sudo apt-get update
+	@sudo apt-get install -y snapd
+	@sudo snap refresh
+	@sudo snap install rustup --classic
 
 .PHONY: install-deps
 install-deps: install-snap ## Install development dependencies
 	@echo "Installing dependencies..."
-	rustup component add rustfmt clippy
-	cargo install cargo-tarpaulin
-	cargo install cargo-audit
+	@rustup component add rustfmt clippy
+	@cargo install cargo-tarpaulin
+	@cargo install cargo-audit
 
 .PHONY: lint
 lint: format ## Run linters on Rust files
 	@echo "Linting Rust files..."
-	DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) cargo clippy -- -D warnings
+	@DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) cargo clippy -- -D warnings
 
 .PHONY: publish
-publish: ## Publish the package to crates.io (requires CARGO_REGISTRY_TOKEN to be set)
+publish: ## Publish the package to crates.io (needs CARGO_REGISTRY_TOKEN to be set)
 	@echo "Publishing the package to Cargo registry..."
-	cargo publish --token $(CARGO_REGISTRY_TOKEN)
+	@cargo publish --token $(CARGO_REGISTRY_TOKEN)
 
 .PHONY: bench
 bench: ## Run benchmarks
 	@echo "Running benchmarks..."
-	DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) cargo bench
+	@DEBUG_GRAPHINA=$(DEBUG_GRAPHINA) cargo bench
 
 .PHONY: audit
 audit: ## Run security audit on Rust dependencies
 	@echo "Running security audit..."
-	cargo audit
+	@cargo audit
+
+########################################################################################
+## Python targets
+########################################################################################
+
+.PHONY: develop_py
+develop_py: ## Build and install PyGraphina in current Python environment
+	@echo "Building and installing PyGraphina in current Python environment..."
+	@unset CONDA_PREFIX && cd $(PYGRAPHINA_DIR) && maturin develop && cd ..
+
+.PHONY: wheel
+wheel: ## Build the wheel file for PyGraphina
+	@echo "Make the Python wheel file..."
+	@cd $(PYGRAPHINA_DIR) && maturin build --release --out $(WHEEL_DIR) --auditwheel check && cd ..
+
+.PHONY: wheel-manylinux
+wheel-manylinux: ## Build the wheel file for PyGraphina (manylinux version using Zig)
+	@echo "Make the Python wheel file..."
+	@cd $(PYGRAPHINA_DIR) && maturin build --release --out $(WHEEL_DIR) --auditwheel check --zig && cd ..
+
+.PHONY: test_py
+test_py: develop_py ## Run Python tests
+	@echo "Running Python tests..."
+	@poetry run pytest $(PYGRAPHINA_DIR)/tests
+
+.PHONY: publish_py
+publish_py: wheel ## Publish the PyGraphina wheel to PyPI (needs PYPI_TOKEN to be set)
+	@echo "Publishing the PyGraphina wheel to PyPI..."
+	@echo "Found wheel file: $(WHEEL_FILE)"
+	@twine upload -u __token__ -p $(PYPI_TOKEN) $(WHEEL_FILE)
+
+.PHONY: generat_ci
+generate_ci: ## Generate CI configuration files (GitHub Actions workflow)
+	@echo "Generating CI configuration files..."
+	@cd $(PYGRAPHINA_DIR) && maturin generate-ci --zig --pytest --platform all \
+	-o ../.github/workflows/ci.yml github && cd ..