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

Jump to bottom

Develop merge for release 2.0.0 #201

Merged
merged 393 commits into from
Mar 1, 2024
Merged

Develop merge for release 2.0.0 #201

merged 393 commits into from
Mar 1, 2024

Conversation

Shettland
Copy link
Member

PR checklist

  • Merge develop branch into main, preparing for release of version 2.0.0
  • Make sure your code lints (black and flake8).
  • If a new tamplate was added make sure:
    • Template's schema is added in templates/services.json.
    • Template's pipeline's documentation in assets/reports/md/template.md is added.
    • Results Documentation in assets/reports/results/template.md is updated.
  • CHANGELOG.md is updated.
  • README.md is updated (including new tool citations and authors/contributors).
  • If you know a new user was added to the SFTP, make sure you added it to templates/sftp_user.json

@GuilleGorines
naming people naming!
1f5b85b
@GuilleGorines
beauty change!
4088c66
@GuilleGorines
naming again
401bb22
@GuilleGorines
whole lotta naming
f4ac048
@GuilleGorines
not quite sure about options display
9457154
@GuilleGorines
not sure about letting the user choose the day
513be45
@GuilleGorines
more choices!
7d79eb6
@GuilleGorines
changed choice to prompt in day selection
e03b067
@GuilleGorines
needed explanation
e86b2dc
@GuilleGorines
fixed type error
c3070e0
@GuilleGorines
tiny changes
0d77f3f
@GuilleGorines
updated to take previous date into account
0ab8dd1
@GuilleGorines
tunnel vision!
350f193
@GuilleGorines
same typo as before
b7a7e1e
@GuilleGorines
updated the number of months
a70c839
@GuilleGorines
typo
0e9e9f6
@GuilleGorines
checking sthg
ef469db
@GuilleGorines
testing changes
46d6a96
@GuilleGorines
god this is getting tedious
0c640e5
@GuilleGorines
this should be working now
8bcac28
@GuilleGorines
Clearer question
1086069
@GuilleGorines
just a goof
49427a0
@GuilleGorines
updated code comments
6e2e5cd
@GuilleGorines
change in api path to work locally
529f9df
@GuilleGorines
checking on api
f0652d6
@GuilleGorines
testing the api
60b7ec2
@GuilleGorines
updated api query
8b86146
@GuilleGorines
change I forgot to add
b068ad6
@GuilleGorines
checking
b66f6b3
@GuilleGorines
update ask date function
58896c5
svarona and others added 16 commits October 30, 2023 10:23
@svarona @saramonzon
Fixed black
c1af994
@svarona
Merge branch 'develop' into iskylims_isciiides
490c8d8
@svarona
Fixed black
64105a8
@svarona
Fixed SFTP path
2de3dc6
@svarona
Fixed tamplet when no samples in service
eced4e0
@svarona
Merge pull request #171 from svarona/iskylims_isciiides
44cdd27 
Merge branch 'develop' into iskylims_isciiides
@saramonzon
added gubbins to snippy template
6814155
@svarona
Merge remote-tracking branch 'origin/develop' into iskylims_isciiides
9ccbb1d
@svarona
Created template for freebayes_outbreak
6db38ca
@svarona
Added freebayes outbreak
0e3d06f
@svarona
Merge pull request #175 from svarona/iskylims_isciiides
aa93319 
Merged develop into Iskylims isciiides
@svarona
Merge pull request #181 from BU-ISCIII/iskylims_isciiides
f4efe59 
Merge iskylims_isciiides into develop
@saramonzon
Merge pull request #194 from BU-ISCIII/main
c1a51c1 
Merge changes from main into develop
@Shettland
Prepare Release 2.0.0
42253b5
@Shettland
Prepare Release 2.0.0 .
a2c45ac
@Shettland
Prepare Release 2.0.0. Linting
e1cce2c
@saramonzon
Copy link
Member

@Shettland You need to prepare the changelog for the next release!

saramonzon
saramonzon previously approved these changes Feb 29, 2024
View reviewed changes
Copy link
Member

@saramonzon saramonzon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just fixing the changelog, I don't see anything else weird. Let's see if it works and how many fixes we need xD

Daniel-VM
Daniel-VM approved these changes Mar 1, 2024
View reviewed changes
Copy link
Member

@Daniel-VM Daniel-VM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Shettland Shettland merged commit 69d8477 into main Mar 1, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saramonzon saramonzon saramonzon approved these changes

@Daniel-VM Daniel-VM Daniel-VM approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Shettland @saramonzon @Daniel-VM @GuilleGorines @svarona