From 84cfef85d29448af26dd38825377aecb90293d20 Mon Sep 17 00:00:00 2001 From: Geoffrey Woollard Date: Mon, 1 Jul 2024 10:17:35 -0400 Subject: [PATCH 1/4] empty for dev --- empty | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 empty diff --git a/empty b/empty new file mode 100644 index 0000000..e69de29 From 4203b22752f77e8893de9144a68995e989277da4 Mon Sep 17 00:00:00 2001 From: Geoffrey Woollard Date: Mon, 1 Jul 2024 10:17:48 -0400 Subject: [PATCH 2/4] remove --- empty | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 empty diff --git a/empty b/empty deleted file mode 100644 index e69de29..0000000 From c157caee17d6c95a8a79f18ab670c6e06082d434 Mon Sep 17 00:00:00 2001 From: DavidHerreros Date: Wed, 3 Jul 2024 10:27:30 +0200 Subject: [PATCH 3/4] Fix typo in package version --- .github/workflows/main_merge_check.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/main_merge_check.yml diff --git a/.github/workflows/main_merge_check.yml b/.github/workflows/main_merge_check.yml new file mode 100644 index 0000000..a2ec60d --- /dev/null +++ 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 \ No newline at end of file From c939aefdbde1e31fc7bf7fd4bc4384e8db7c263a Mon Sep 17 00:00:00 2001 From: DavidHerreros Date: Wed, 3 Jul 2024 12:19:39 +0200 Subject: [PATCH 4/4] Publish to Pypi and version tag workflow --- .github/workflows/main_merge_check.yml | 2 +- src/cryo_challenge/__init__.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main_merge_check.yml b/.github/workflows/main_merge_check.yml index a2ec60d..8e6f5c5 100644 --- a/.github/workflows/main_merge_check.yml +++ b/.github/workflows/main_merge_check.yml @@ -1,4 +1,4 @@ -name: 'Check merging branch' +name: Check merging branch on: pull_request: diff --git a/src/cryo_challenge/__init__.py b/src/cryo_challenge/__init__.py index e69de29..cafea4e 100644 --- a/src/cryo_challenge/__init__.py +++ b/src/cryo_challenge/__init__.py @@ -0,0 +1 @@ +from cryo_challenge.__about__ import __version__ \ No newline at end of file