Skip to content

Merge staging ingestion into main #78

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

Merged
merged 4 commits into from
Jan 10, 2023
Merged

Merge staging ingestion into main #78

merged 4 commits into from
Jan 10, 2023

Conversation

susodapop
Copy link
Contributor

@susodapop susodapop commented Jan 9, 2023

This is a follow-up to:

It merges the staging ingestion feature into main so we can release it to Pypi.

We need to re-lock our dependencies because the poetry.lock file is different between these branches. To do this:

  1. Merge main back into si (taking the version of poetry.lock from main). At this point, the lock file and pyproject.toml disagree with one another and will raise an error.
  2. rm poetry.lock
  3. poetry install which regenerates a new lockfile from pyproject.toml

@susodapop susodapop marked this pull request as draft January 9, 2023 03:09
@github-actions
Copy link

github-actions bot commented Jan 9, 2023

Thanks for your contribution! To satisfy the DCO policy in our contributing guide every commit message must include a sign-off message. One or more of your commits is missing this message. You can reword previous commit messages with an interactive rebase (git rebase -i main).

@github-actions
Copy link

github-actions bot commented Jan 9, 2023

Thanks for your contribution! To satisfy the DCO policy in our contributing guide every commit message must include a sign-off message. One or more of your commits is missing this message. You can reword previous commit messages with an interactive rebase (git rebase -i main).

@susodapop susodapop marked this pull request as ready for review January 9, 2023 18:03
@susodapop
Copy link
Contributor Author

Running e2e tests locally now. Once these pass this will be ready to merge.

@susodapop
Copy link
Contributor Author

e2e tests pass

Copy link
Collaborator

@moderakh moderakh left a comment

Choose a reason for hiding this comment

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

Thanks @susodapop

@susodapop susodapop merged commit 258b961 into main Jan 10, 2023
@susodapop susodapop deleted the si branch January 10, 2023 17:39
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.

2 participants