diff --git a/news/703-adjust-reqs b/news/703-adjust-reqs new file mode 100644 index 00000000..d9806ae0 --- /dev/null +++ b/news/703-adjust-reqs @@ -0,0 +1,19 @@ +### Enhancements + +* + +### Bug fixes + +* + +### Deprecations + +* + +### Docs + +* + +### Other + +* Ensure requirements are in sync across different sources (setup.py, conda recipe, feedstocks). (#703) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f307adc7..77fd8f99 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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] diff --git a/setup.py b/setup.py index d34ea79f..022ec64c 100644 --- a/setup.py +++ b/setup.py @@ -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'", ],