Merge pull request #48 from flatironinstitute/main

update dev with main
flatironinstitute · Jul 13, 2024 · 2f0b6a9 · 2f0b6a9
2 parents e423526 + 995d722
commit 2f0b6a9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/.github/workflows/main_merge_check.yml b/.github/workflows/main_merge_check.yml
@@ -0,0 +1,14 @@
+name: Check merging branch
+
+on:
+  pull_request:
+
+jobs:
+  check_branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check branch
+        if: github.base_ref == 'main' && github.head_ref != 'dev'
+        run: |
+          echo "ERROR: You can only merge to main from dev."
+          exit 1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,6 @@ repos:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
-    -   id: check-added-large-files
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
   rev: v0.3.4

diff --git a/src/cryo_challenge/__init__.py b/src/cryo_challenge/__init__.py
@@ -0,0 +1 @@
+from cryo_challenge.__about__ import __version__
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		from cryo_challenge.__about__ import __version__