Merge pull request #6 from systemallica/dev

Update project tooling + dependencies
systemallica · May 5, 2024 · ce8f28d · ce8f28d
2 parents 6a4fd33 + 76bdd80
commit ce8f28d
Show file tree

Hide file tree

Showing 14 changed files with 205 additions and 928 deletions.
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -0,0 +1,14 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+    - uses: pre-commit/[email protected]
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,11 +1,7 @@
 repos:
--   repo: https://github.com/timothycrosley/isort
-    rev: 5.6.4
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.3
     hooks:
-    - id: isort
-      args: ["--profile", "black"]
--   repo: https://github.com/ambv/black
-    rev: 20.8b1
-    hooks:
-    - id: black
-      language_version: python3
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -8,7 +8,7 @@ repo_name: 'systemallica/morfist'
 repo_url: 'https://github.com/systemallica/morfist'
 
 # Copyright
-copyright: 'Copyright &copy; 2020 Andrés Reverón Molina'
+copyright: 'Copyright &copy; 2024 Andrés Reverón Molina'
 
 # Configuration
 theme:

diff --git a/morfist/algo/__init__.py b/morfist/algo/__init__.py
@@ -1,2 +0,0 @@
-from morfist.algo.evaluation import cross_validation
-from morfist.algo.histogram import numba_histogram

diff --git a/morfist/core/__init__.py b/morfist/core/__init__.py
@@ -1,3 +0,0 @@
-from morfist.core.MixedRandomForest import MixedRandomForest
-from morfist.core.MixedRandomTree import MixedRandomTree
-from morfist.core.MixedSplitter import MixedSplitter

diff --git a/morfist/legacy/__init__.py b/morfist/legacy/__init__.py
@@ -1 +0,0 @@
-from morfist.legacy import *
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		from morfist.algo.evaluation import cross_validation
		from morfist.algo.histogram import numba_histogram