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.

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

Derek furst/python ci workflow #169

Closed
wants to merge 79 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
1b7340a
Merge pull request #22 from hubmapconsortium/shirey/add-submission
yuanzhou Mar 23, 2021
50bfb6e
Merge branch 'test-release' into dev-integrate
yuanzhou Mar 25, 2021
3ab4a88
Merge branch 'test-release' into dev-integrate
yuanzhou Mar 30, 2021
d51c360
Merge pull request #26 from hubmapconsortium/yuanzhou/rename-submission
yuanzhou Apr 12, 2021
870eab8
Bump version to 2.0.2
yuanzhou Apr 12, 2021
81155e0
Merge branch 'test-release' into dev-integrate
yuanzhou Apr 13, 2021
0a580e3
Merge pull request #30 from hubmapconsortium/shirey/add-avr
shirey Jun 20, 2021
5490ea0
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou Aug 9, 2021
4e7bd2e
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou Oct 5, 2021
ff650ed
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou Nov 12, 2021
c124ffd
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou Jan 4, 2022
0782b5c
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou Jan 11, 2022
c410f27
Merge pull request #46 from sennetconsortium/generalize-uuid-branch
yuanzhou Jan 19, 2022
bfcd9dc
Update app.cfg.example
yuanzhou Jan 19, 2022
95456af
Resolve merge conflict
yuanzhou Jan 19, 2022
dd7d76c
Merge remote-tracking branch 'sennet/generalize-uuid-branch' into dev…
yuanzhou Jan 29, 2022
53afc0b
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou Feb 9, 2022
3a005d0
Update sample config with resolving merge conflict
yuanzhou Feb 28, 2022
ee5d814
Merge sennet tweaks with resolving conficts
yuanzhou Apr 4, 2022
806dd9a
Merge pull request #66 from sennetconsortium/generalize-uuid-branch
yuanzhou Apr 4, 2022
751e8db
Merge pull request #69 from sennetconsortium/generalize-uuid-branch
yuanzhou Apr 21, 2022
771e980
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou Apr 28, 2022
d12a0fe
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou May 10, 2022
a67af11
Merge pull request #75 from sennetconsortium/generalize-uuid-branch
yuanzhou May 10, 2022
f927d16
Merge pull request #83 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou May 23, 2022
ab4077b
Merge branch 'test-release' of https://github.com/hubmapconsortium/uu…
yuanzhou May 24, 2022
12fc5f2
Merge pull request #85 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou May 26, 2022
a0e966a
Merge pull request #87 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou May 31, 2022
7aef36d
Merge pull request #88 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou May 31, 2022
b265ffd
Merge pull request #90 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou Jun 14, 2022
e7bdd8a
Merge pull request #94 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou Jun 15, 2022
6496234
Merge pull request #95 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou Jun 15, 2022
d87876e
Merge pull request #96 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou Jun 16, 2022
78e4446
Merge pull request #98 from hubmapconsortium/kburke/uuidSchemaRevisions
yuanzhou Jun 23, 2022
e0689c9
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Jun 27, 2022
4590c65
Merge pull request #104 from hubmapconsortium/yuanzhou/flask-v2
yuanzhou Jul 24, 2022
0d28aa5
Sync with main
yuanzhou Jul 27, 2022
b9e79a0
Address merge conflict
yuanzhou Aug 11, 2022
610169a
Sync with main
yuanzhou Aug 11, 2022
313ba7f
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Aug 29, 2022
659918c
Merge pull request #109 from hubmapconsortium/shirey/use-refactored-c…
yuanzhou Sep 14, 2022
da9f538
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Oct 12, 2022
a50664a
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Oct 18, 2022
e50e387
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Nov 1, 2022
34afbe3
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Nov 22, 2022
c73b490
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Nov 22, 2022
2e1eae4
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Jan 18, 2023
e9e08d4
Merge pull request #119 from hubmapconsortium/kburke/lockOnUTC
yuanzhou Jan 18, 2023
ca2817b
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Jan 18, 2023
9ab16c1
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Feb 13, 2023
018e644
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Feb 13, 2023
b39004a
Merge pull request #122 from hubmapconsortium/karlburke/publicationTr…
yuanzhou Feb 13, 2023
adfba08
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Feb 21, 2023
36a5060
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Mar 24, 2023
db713ed
Merge pull request #126 from hubmapconsortium/karlburke/dumpUuidS3Use…
yuanzhou Mar 24, 2023
e1e5675
Merge pull request #128 from hubmapconsortium/karlburke/dumpUuidS3Use…
yuanzhou Mar 24, 2023
c8868bb
Merge pull request #129 from hubmapconsortium/shirey/fix-bom-chars-tr…
yuanzhou Mar 28, 2023
ec7facb
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou May 30, 2023
bf163a1
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Jul 12, 2023
defb4fb
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Jul 14, 2023
a9e1a6e
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Jul 17, 2023
10a0937
Merge pull request #136 from hubmapconsortium/yuanzhou/log
yuanzhou Oct 22, 2023
554a8bf
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Jan 31, 2024
00b41b9
Merge pull request #141 from x-atlas-consortia/karlburke/Publications…
yuanzhou Jan 31, 2024
4f3897d
Merge branch 'main' of https://github.com/x-atlas-consortia/uuid-api …
yuanzhou Apr 3, 2024
0dda9ac
Merge pull request #144 from x-atlas-consortia/yuanzhou/enable-multit…
yuanzhou Apr 5, 2024
d74f883
Merge pull request #146 from x-atlas-consortia/maxsibilla/sennet-clou…
maxsibilla Apr 17, 2024
a574ca0
Merge branch 'main' of https://github.com/x-atlas-consortia/uuid-api …
yuanzhou May 7, 2024
15c6d81
Merge pull request #149 from x-atlas-consortia/Derek-Furst/add-epicol…
yuanzhou May 8, 2024
dc53252
Merge branch 'main' of https://github.com/hubmapconsortium/uuid-api i…
yuanzhou Jul 10, 2024
8b8903c
Merge pull request #153 from x-atlas-consortia/karlburke/manyAncestorOps
yuanzhou Jul 11, 2024
7af88c5
Merge pull request #155 from x-atlas-consortia/karlburke/flask3updates
yuanzhou Jul 15, 2024
9dc878e
Merge pull request #157 from x-atlas-consortia/karlburke/flask3updates
yuanzhou Jul 16, 2024
173719c
Merge pull request #158 from x-atlas-consortia/yuanzhou/new-docker-base
yuanzhou Sep 4, 2024
bd9a354
Merge branch 'main' of https://github.com/x-atlas-consortia/uuid-api …
yuanzhou Oct 17, 2024
ebd8a1b
Merge branch 'main' of https://github.com/x-atlas-consortia/uuid-api …
yuanzhou Oct 17, 2024
e56a82a
Merge branch 'main' of https://github.com/x-atlas-consortia/uuid-api …
yuanzhou Oct 28, 2024
dccf997
Merge pull request #165 from x-atlas-consortia/karlburke/ReviseCommon…
yuanzhou Oct 29, 2024
5043313
Create python-app.yml
DerekFurstPitt Nov 26, 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
Prev Previous commit
Next Next commit
…into dev-integrate
yuanzhou committed Oct 17, 2024
commit bd9a354d00b708654f0e90019f280dabb03d7659

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.