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

Flexible Conda Dependencies #1109

Merged
merged 7 commits into from
Oct 31, 2024
Merged

Flexible Conda Dependencies #1109

merged 7 commits into from
Oct 31, 2024

Conversation

sdc50
Copy link
Member

@sdc50 sdc50 commented Oct 29, 2024

  • Fixes the install_tethys.sh script so the specified version of python is installed
  • Avoids modifying the environment.yml file so the conda packages will have flexible dependencies
  • Modifies some syntax in the codebase to be compatible with python=3.10

@sdc50
Copy link
Member Author

sdc50 commented Oct 30, 2024

image

I'm not sure how the python=3.10 tests were passing previously as we use this syntax:

@sdc50
Copy link
Member Author

sdc50 commented Oct 30, 2024

I'm not sure how the python=3.10 tests were passing previously as we use this syntax:

It appears that the python version wasn't being set correctly in the test matrix previously: https://github.com/tethysplatform/tethys/actions/runs/11576539437/job/32285872638?pr=1107#step:4:264

The sed command to substitute the python version had a typo, so it wasn't actually pinning the python version.

The good news is that this PR fixes that! The bad news is that our code base is not currently compatible with python=3.10 like with thought.

@coveralls
Copy link

coveralls commented Oct 30, 2024

Coverage Status

coverage: 100.0%. remained the same
when pulling ed58ee4 on flexible_conda_build
into 4267324 on main.

@sdc50
Copy link
Member Author

sdc50 commented Oct 30, 2024

It looks like all checks are passing with the current approach (create the environment with the original environment.yml file and then afterward install the correct version of python and django). However, when I did this locally (downgrading to python=3.10) it tried to install sqlalchemy=2 and also was going to downgrade tethys_dataset_services. I checked the test environment on GitHub Actions and it looks like it didn't do this, but I still think it prudent to modify the approach.

For both efficiency and stability I'm going to modify the contents of the environment.yml file, but rather than overwrite the original file, it will write it out to a new file. The new file will be used to create the test environment, but the original environment.yml file will remain unchanged so that it can be used to create the correct (flexible) dependencies for the conda package.

Copy link
Contributor

@gagelarsen gagelarsen left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@swainn swainn merged commit e3b89c5 into main Oct 31, 2024
42 checks passed
@swainn swainn deleted the flexible_conda_build branch October 31, 2024 15:26
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.

4 participants