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

conda requirements add pip #4062

Merged
merged 1 commit into from
Mar 15, 2021
Merged

Conversation

bjlittle
Copy link
Member

🚀 Pull Request

Description

As a developer I'm continually leaning on pip when it's relevant... can't see a good reason why this isn't already part of the developer environment for iris.


Consult Iris pull request check list

Copy link
Contributor

@tkknight tkknight 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. This is for the development iris environment. The release version recipe https://github.com/conda-forge/iris-feedstock/blob/master/recipe/meta.yaml makes use of pip but does not include it in the release.

@tkknight tkknight merged commit f78aa9d into SciTools:master Mar 15, 2021
@bjlittle
Copy link
Member Author

@tkknight Awesome thanks! 😄

@bjlittle bjlittle deleted the requirements-add-pip branch April 9, 2021 18:48
tkknight added a commit to tkknight/iris that referenced this pull request May 17, 2021
* master: (49 commits)
  Update CI environment lockfiles + Cartopy 0.19 changes (SciTools#4125)
  separate arg types from descriptions (SciTools#4100)
  Use assertArrayAllClose for sqrt test (SciTools#4118)
  Removed branch suffix (SciTools#4117)
  Corrected plot_anomaly_log_colouring for new Matplotlib linscale rules. (SciTools#4115)
  replace most recent hashes (SciTools#4112)
  Linkcheck update (SciTools#4104)
  CI lockfiles (SciTools#4108)
  Fix bug in gallery_tests runner (SciTools#4111)
  add logo to conda and pypi badges (SciTools#4088)
  pre-commit-ci update (SciTools#4092)
  Fix cirrus ci and mpl (SciTools#4087)
  Update readme docs stable (SciTools#4089)
  linux kernel version fix for conda 4.10+ (SciTools#4084)
  update docs pypi instructions (SciTools#4077)
  update flake8 pre-commit (SciTools#4067)
  Add GitHub discussions badge (SciTools#4070)
  conda requirements add pip (SciTools#4062)
  add pre-commit.ci badge and doc support (SciTools#4061)
  cirrus-ci credits for non-master (SciTools#4060)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants