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

Use declarative setuptools #7629

Merged
merged 18 commits into from
Mar 30, 2023
Merged

Use declarative setuptools #7629

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
21cff2b
use declarative setuptools
graingert Mar 8, 2023
76ca4a6
also run conda build on a setup.cfg change
graingert Mar 8, 2023
5833f30
install versioneer as a conda host requirement
graingert Mar 8, 2023
bc898d3
apply ini2toml
graingert Mar 16, 2023
cfff095
fix pytest pyproject.toml filterwarnings section
graingert Mar 16, 2023
f76fb38
install versioneer toml support
graingert Mar 16, 2023
c1f1f26
fix VCS case in versioneer config
graingert Mar 16, 2023
588ddc0
Update .github/workflows/conda.yml
graingert Mar 16, 2023
f10b451
remove duplicate codespell config from setup.cfg
graingert Mar 17, 2023
6d9940f
note flake8's lack of pyproject.toml support
graingert Mar 17, 2023
a57f074
move coveragerc into pyproject.toml
graingert Mar 22, 2023
4860d0b
Merge branch 'main' of github.com:dask/distributed into use-declarati…
graingert Mar 28, 2023
65392c3
fix test_old_ssh_nprocs_renamed_to_n_workers warning filter
graingert Mar 28, 2023
df5329f
move flake8 config to .flake8
graingert Mar 29, 2023
853b636
remove outdated references to setup.cfg
graingert Mar 29, 2023
50a268b
remove --channel conda-forge from mambabuild
graingert Mar 29, 2023
4cd6108
Merge branch 'main' of github.com:dask/distributed into use-declarati…
graingert Mar 29, 2023
1280220
Rerun CI
jrbourbeau Mar 29, 2023
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
32 changes: 0 additions & 32 deletions .coveragerc
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ on:
pull_request:
paths:
- setup.py
- requirements.txt
- setup.cfg
graingert marked this conversation as resolved.
Show resolved Hide resolved
- continuous_integration/recipes/**
- .github/workflows/conda.yml
graingert marked this conversation as resolved.
Show resolved Hide resolved
- pyproject.toml

# When this workflow is queued, automatically cancel any previous running
# or pending jobs from the same branch
Expand Down Expand Up @@ -55,12 +56,14 @@ jobs:

# distributed pre-release build
conda mambabuild continuous_integration/recipes/distributed \
--channel conda-forge \
graingert marked this conversation as resolved.
Show resolved Hide resolved
--channel dask/label/dev \
--no-anaconda-upload \
--output-folder .

# dask pre-release build
conda mambabuild continuous_integration/recipes/dask \
--channel conda-forge \
--channel dask/label/dev \
--no-anaconda-upload \
--output-folder .
Expand Down
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ repos:
hooks:
- id: black
language_version: python3
exclude: versioneer.py
args:
- --target-version=py38
- repo: https://github.com/pycqa/flake8
Expand All @@ -38,6 +37,8 @@ repos:
rev: v2.2.2
hooks:
- id: codespell
additional_dependencies:
- tomli
types_or: [rst, markdown]
files: docs
- repo: https://github.com/pre-commit/mirrors-mypy
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ include setup.py
include README.rst
include LICENSE.txt
include MANIFEST.in
include requirements.txt
include distributed/py.typed
exclude distributed/pytest_resourceleaks.py

prune docs/_build
include versioneer.py
include distributed/_version.py
2 changes: 2 additions & 0 deletions continuous_integration/recipes/distributed/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ requirements:
- python >=3.8
- pip
- dask-core {{ dask_version }}
- versioneer =0.28
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
- tomli # [py<311]
Copy link
Member

Choose a reason for hiding this comment

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

Is the version selector necessary here? IIRC this is a noarch build

Copy link
Member Author

Choose a reason for hiding this comment

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

If we build on 3.11 tomli isn't needed, my understanding is noarch builds still build a package for each python version?

Copy link
Member

@jakirkham jakirkham Mar 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

While true, versioneer has try...except... logic to prefer the builtin when available. So it probably doesn't matter much whether the selector is here or not

Think Charles' point is we generally don't want to use selectors in a noarch file since it can't really be conditioned. That said, with build & host dependencies this is less relevant. Since those are just used for the build and the packages wind up with a fixed set of dependencies regardless

This all to say there are valid reasons to drop this selector or keep it. However in terms of the end result, it shouldn't matter which way we go

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the clarification @jakirkham - I'm fine going either way here, just wanted to verify that this had no impact on the build

run:
- python >=3.8
- click >=8.0
Expand Down
Loading