Skip to content

Fix out-of-sync requirements #12

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

Merged
3 commits merged into from
Aug 26, 2021
Merged

Fix out-of-sync requirements #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ee96ed
Pin portalocker
maresb Aug 26, 2021
b340df6
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and cond…
Aug 26, 2021
ad4441c
Add min python versions
maresb Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-comp7
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.9.* *_cpython
zip_keys:
- - cdt_name
- docker_image
49 changes: 41 additions & 8 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions .scripts/logging_utils.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 23 additions & 6 deletions .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 36 additions & 3 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ source:

build:
noarch: python
Comment thread
This conversation was marked as resolved.
number: 0
number: 1
script: {{ PYTHON }} -m pip install . -vv

requirements:
host:
- python
- python >=3.6
- pip
run:
- python
- python >=3.6
- msal >=0.4.1,<2.0
- portalocker
- portalocker >=1.6,<2.0
Copy link
Copy Markdown
Member

@dhirschfeld dhirschfeld Aug 26, 2021

Choose a reason for hiding this comment

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

I suspect that pip check may only be happy if you specify ~=1.6 for # [win] and ~=1.0 for # [not win]

Copy link
Copy Markdown
Member

@dhirschfeld dhirschfeld Aug 26, 2021

Choose a reason for hiding this comment

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

...which will require removing noarch (and rerendering)

Copy link
Copy Markdown
Contributor Author

@maresb maresb Aug 26, 2021

Choose a reason for hiding this comment

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

My understanding is that pip check looks at the currently installed packages and verifies that they are in a consistent state. Since anything with >=1.6,<2.0 is consistent in either case, it should be fine.

Copy link
Copy Markdown
Member

@dhirschfeld dhirschfeld Aug 26, 2021

Choose a reason for hiding this comment

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

I'm not so familiar with pip but that makes sense.... and the CI concurs!


test:
imports:
Expand Down