Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dev with main #48

Merged
merged 7 commits into from
Jul 13, 2024
Merged

update dev with main #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c157cae
Fix typo in package version
DavidHerreros Jul 3, 2024
c939aef
Publish to Pypi and version tag workflow
DavidHerreros Jul 3, 2024
8d0ddaa
Update .pre-commit-config.yaml
DSilva27 Jul 11, 2024
efed76e
Merge pull request #38 from flatironinstitute/DSilva27-patch-1
geoffwoollard Jul 11, 2024
60057ed
Merge pull request #37 from flatironinstitute/dev
geoffwoollard Jul 12, 2024
047b1ca
Merge pull request #33 from flatironinstitute/main_merge_dev
geoffwoollard Jul 12, 2024
995d722
Merge pull request #47 from flatironinstitute/dev
DSilva27 Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/main_merge_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/cryo_challenge/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from cryo_challenge.__about__ import __version__
Loading