Skip to content

Commit

Permalink
Update requirements (#703)
Browse files Browse the repository at this point in the history
* Synchronize requirements in recipe and setup.py

* add news

---------

Co-authored-by: jaimergp <jaimergp@users.noreply.github.com>
  • Loading branch information
marcoesters and jaimergp authored Jul 24, 2023
1 parent 3d93d57 commit cc01507
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
19 changes: 19 additions & 0 deletions news/703-adjust-reqs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Enhancements

* <news item>

### Bug fixes

* <news item>

### Deprecations

* <news item>

### Docs

* <news item>

### Other

* Ensure requirements are in sync across different sources (setup.py, conda recipe, feedstocks). (#703)
4 changes: 1 addition & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ requirements:
host:
- python
- pip
# FIXME: Workaround for xz 5.2.10 issue on py310
- xz !=5.2.10 # [win and py == 310]
run:
- conda >=4.6
- python
- ruamel.yaml >=0.11.14,<0.18
- conda-standalone <23.1.0 # https://github.com/conda/constructor/issues/628
- conda-standalone
- pillow >=3.1 # [win or osx]
- nsis >=3.08 # [win]
run_constrained: # [unix]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
install_requires=[
"conda >=4.6",
"ruamel.yaml",
"ruamel.yaml >=0.11.14,<0.18",
"pillow >=3.1 ; platform_system=='Windows' or platform_system=='Darwin'",
# non-python dependency: "nsis >=3.08 ; platform_system=='Windows'",
],
Expand Down

0 comments on commit cc01507

Please sign in to comment.