From d8136462c9da6ad069aa1248ba8d3284946d3f90 Mon Sep 17 00:00:00 2001 From: DavidHerreros Date: Wed, 3 Jul 2024 10:27:30 +0200 Subject: [PATCH 1/3] 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 86bb837642bdce6ae6304758a388bb0879b83cfb Mon Sep 17 00:00:00 2001 From: DavidHerreros Date: Wed, 3 Jul 2024 12:19:39 +0200 Subject: [PATCH 2/3] 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 From a021fcf56b54f7fcf072537c51f078281c98cac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Silva-S=C3=A1nchez?= <31875788+DSilva27@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:11:01 -0400 Subject: [PATCH 3/3] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2d1bb35..e3c79b8 100644 --- 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