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.

Sign up for GitHub

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

Jump to bottom

Fix conda requirements #186

Merged
merged 2 commits into from
Jan 18, 2022
Merged

Fix conda requirements #186

merged 2 commits into from
Jan 18, 2022

Conversation

forsyth2
Copy link
Collaborator

Fix conda requirements causing https://github.com/E3SM-Project/zstash/releases/tag/v1.2.0rc1 to not build properly.

@forsyth2 forsyth2 added the semver: bug Bug fix (will increment patch version) label Jan 18, 2022
@forsyth2 forsyth2 self-assigned this Jan 18, 2022
@forsyth2
Copy link
Collaborator Author

@tomvothecoder Are these changes sufficient to get the build working?

#154 introduced the relevant code block into setup.py:

    install_requires=[
        "six==1.16.0",
        "globus-sdk==2.0.1",
        "fair-research-login==0.2.0",
    ],

tomvothecoder
tomvothecoder approved these changes Jan 18, 2022
View reviewed changes
Copy link
Collaborator

@tomvothecoder tomvothecoder left a comment

Choose a reason for hiding this comment

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

Added some suggestions, then looks good.

conda/dev.yml Outdated
Comment on lines 10 to 12
- six==1.16.0
- globus-sdk==2.0.1
- fair-research-login==0.2.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- six==1.16.0
- globus-sdk==2.0.1
- fair-research-login==0.2.0
- six=1.16.0
- globus-sdk=2.0.1
- fair-research-login=0.2.0

conda/meta.yaml Outdated
Comment on lines 24 to 26
- six==1.16.0
- globus-sdk==2.0.1
- fair-research-login==0.2.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- six==1.16.0
- globus-sdk==2.0.1
- fair-research-login==0.2.0
- six
- globus-sdk
- fair-research-login

Copy link
Collaborator

Choose a reason for hiding this comment

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

No pinning in meta.yaml to increase compatibility when installing in conda envs.

@forsyth2 forsyth2 merged commit 89b12af into E3SM-Project:master Jan 18, 2022
@forsyth2 forsyth2 deleted the fix-rc1 branch January 18, 2022 18:46
@forsyth2 forsyth2 added the DevOps CI/CD, configuration, etc. label Jan 18, 2022
@forsyth2 forsyth2 mentioned this pull request Jun 16, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomvothecoder tomvothecoder tomvothecoder approved these changes

Assignees

@forsyth2 forsyth2

Labels
DevOps CI/CD, configuration, etc. semver: bug Bug fix (will increment patch version)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@forsyth2 @tomvothecoder