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

ODK Upgrade #159

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

ODK Upgrade #159

wants to merge 2 commits into from

Conversation

joeflack4
Copy link
Contributor

@joeflack4 joeflack4 commented Nov 2, 2024

resolves #114
resolves #127

Changes

  • Upgrade to v1.5.3. Has a bugfix for SSSOM and includes dotenv package.

@joeflack4 joeflack4 self-assigned this Nov 2, 2024
@joeflack4 joeflack4 added the bug Something isn't working label Nov 2, 2024
- Upgrade to v1.5.3. Has a bugfix for SSSOM and includes dotenv package.
- Bug fix: Need to add '--user --break-system-packages' due to new nature of ODK security.
@joeflack4 joeflack4 marked this pull request as ready for review November 5, 2024 00:08
Copy link
Contributor Author

@joeflack4 joeflack4 Nov 5, 2024

Choose a reason for hiding this comment

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

I will check later, but not sure yet why these notebooks are showing up in the diff. They should be on main, not in this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, these files should not be here

@@ -65,7 +65,7 @@ get-pmids:

# SETUP / INSTALLATION -------------------------------------------------------------------------------------------------
install:
pip install -r requirements-unlocked.txt
pip install -r requirements-unlocked.txt --user --break-system-packages
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Build passing now after adding this.

Copy link
Contributor

Choose a reason for hiding this comment

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

Why is --user --break-system-packages needed? I thought that was just to add packages that aren't in ODK and ODK should now have everything this repo needs, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here is the rationale. I'd rather not have to keep adding/removing make install every time I introduce a new package.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm.... ok. Is it mentioned somewhere, other than a PR comment, that any new non-ODK package needed here does need an ODK issue to request it :)

Copy link
Contributor Author

@joeflack4 joeflack4 Nov 5, 2024

Choose a reason for hiding this comment

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

I do have it in my 'rules', which I review every now and then, that I personally should open up a GH issue in such an event, but I wouldn't know where to write these things down; maybe some mondo-ingest developer documentation.

Also alternatively, if we wanted to make this make install thing more efficient, we could have it run a script that instead iterates over each package in the requirements.txt, checks first if it is already installed globally, and then only do the pip install PACKAGE --user --break-system-packages only if it is not. Feels a little excessive, but in a way that is the most elegant approach. Right now it's not a major issue.
Never mind, that suggestion was silly. I just remember. Having the make install really doesn't cause any harm. If the package is already there, of course it won't install. E.g. I just checked the action I just ran off of this branch, and it did not need to install anything:

Requirement already satisfied: python-dotenv in /usr/local/lib/python3.12/dist-packages (from -r requirements-unlocked.txt (line 1)) (1.0.1)

Copy link
Contributor

@twhetzel twhetzel left a comment

Choose a reason for hiding this comment

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

Comments inline

@@ -65,7 +65,7 @@ get-pmids:

# SETUP / INSTALLATION -------------------------------------------------------------------------------------------------
install:
pip install -r requirements-unlocked.txt
pip install -r requirements-unlocked.txt --user --break-system-packages
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is --user --break-system-packages needed? I thought that was just to add packages that aren't in ODK and ODK should now have everything this repo needs, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, these files should not be here

@twhetzel twhetzel self-requested a review November 5, 2024 17:21
Copy link
Contributor

@twhetzel twhetzel left a comment

Choose a reason for hiding this comment

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

Approving now so you're not blocked later after the notebook files are moved out from this PR

@joeflack4 joeflack4 changed the base branch from main to develop November 6, 2024 03:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: run.sh not working: ModuleNotFoundError Make codebase compatible w/ latest ODK
2 participants