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

CanDIG/candigv2-query merging: Bugfix: sidebar cohort style pipeDeliminated #668

Merged
merged 4 commits into from
Jul 8, 2024

Conversation

candigbot
Copy link
Contributor

PR triggered by update to develop branch on CanDIG/candigv2-query. Commit hash: dbc3a9196d4d6b6399242a8305ce5ecbeed85d44. PR link: #44

Copy link
Contributor

@OrdiNeu OrdiNeu left a comment

Choose a reason for hiding this comment

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

Approved in Query PR

candigbot and others added 3 commits July 8, 2024 11:41
Co-authored-by: github-actions <[email protected]>
* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth
…nstructions (#667)

* updating submodules

* Update pip

* Update Makefile

* Update requirements.txt

* remove update setuptools

* setuptools first

* Update requirements.txt

* Update example.env

* Update Makefile

* manually update setuptools

* remove setuptools

* Update example.env

* remove setuptools

* updating submodules (#669)

Co-authored-by: github-actions <[email protected]>

* DIG-1663: Implement curator ingest in katsu and batch ingest (#666)

* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>
@mshadbolt mshadbolt merged commit 36ced49 into develop Jul 8, 2024
2 checks passed
@mshadbolt mshadbolt deleted the CanDIG/candigv2-query-9812995669 branch July 8, 2024 18:52
mshadbolt added a commit that referenced this pull request Jul 8, 2024
…inated (#668)

* updating submodules

* updating submodules (#669)

Co-authored-by: github-actions <[email protected]>

* DIG-1663: Implement curator ingest in katsu and batch ingest (#666)

* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth

* CanDIG/candigv2-ingest merging: DIG-1658: Update commandline ingest instructions (#667)

* updating submodules

* Update pip

* Update Makefile

* Update requirements.txt

* remove update setuptools

* setuptools first

* Update requirements.txt

* Update example.env

* Update Makefile

* manually update setuptools

* remove setuptools

* Update example.env

* remove setuptools

* updating submodules (#669)

Co-authored-by: github-actions <[email protected]>

* DIG-1663: Implement curator ingest in katsu and batch ingest (#666)

* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>
mshadbolt added a commit that referenced this pull request Jul 8, 2024
… bugs, and styling changes (#670)

* updating submodules

* DIG-1663: Implement curator ingest in katsu and batch ingest (#666)

* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth

* CanDIG/candigv2-ingest merging: DIG-1658: Update commandline ingest instructions (#667)

* updating submodules

* Update pip

* Update Makefile

* Update requirements.txt

* remove update setuptools

* setuptools first

* Update requirements.txt

* Update example.env

* Update Makefile

* manually update setuptools

* remove setuptools

* Update example.env

* remove setuptools

* updating submodules (#669)

Co-authored-by: github-actions <[email protected]>

* DIG-1663: Implement curator ingest in katsu and batch ingest (#666)

* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>

* CanDIG/candigv2-query merging: Bugfix: sidebar cohort style pipeDeliminated (#668)

* updating submodules

* updating submodules (#669)

Co-authored-by: github-actions <[email protected]>

* DIG-1663: Implement curator ingest in katsu and batch ingest (#666)

* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth

* CanDIG/candigv2-ingest merging: DIG-1658: Update commandline ingest instructions (#667)

* updating submodules

* Update pip

* Update Makefile

* Update requirements.txt

* remove update setuptools

* setuptools first

* Update requirements.txt

* Update example.env

* Update Makefile

* manually update setuptools

* remove setuptools

* Update example.env

* remove setuptools

* updating submodules (#669)

Co-authored-by: github-actions <[email protected]>

* DIG-1663: Implement curator ingest in katsu and batch ingest (#666)

* fix clean up

* update tests

* add 200

* add comment

* update pip

* revert pip

* try pip update

* fix typo

* fix command

* fix command properly

* add #egg

* test names

* fix typos

* update pip

* revert reqs

* fix req

* fix req2

* remove setup upgrade

* remove setuptools upgrade

* delete auth

* update katsu

* update setuptools

* update ingest

* remove default site admin program auth

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants