Skip to content

Introduce pyproject.toml build changes#764

Merged
bpkroth merged 33 commits into
microsoft:mainfrom
bpkroth:pyproject-toml-build-changes
Jul 2, 2024
Merged

Introduce pyproject.toml build changes#764
bpkroth merged 33 commits into
microsoft:mainfrom
bpkroth:pyproject-toml-build-changes

Conversation

@bpkroth

@bpkroth bpkroth commented Jun 28, 2024

Copy link
Copy Markdown
Contributor

This PR builds off of #762 and #763

These are in part

  1. followup fixups for Cascading series of CI dependency problems #746 (e.g., to allow setuptools-scm to be pulled in at build time as a build dependency only when conda an pip have mismatched version issues), and
  2. Modernization improvements to allow us to make better use of other tools (e.g., black that only accept pyproject.toml files as their configuration files).

To do so, we move some configs from setup.py to pyproject.toml for each module.
However, to retain the ability to rewrite URLs in published README.md files on PyPi as well as consistent version dependencies across modules without the need to manually specify version numbers (e.g., using setuptools-scm) we mark a few dependencies as dynamic and leave our existing logic inside the setup.py file.

Finally, we reorganize the version.py file to be inside the module and fix a few previous omissions for mlos_viz.

@bpkroth bpkroth force-pushed the pyproject-toml-build-changes branch from 9e5e239 to ebdd526 Compare June 28, 2024 17:58
Comment thread .bumpversion.cfg
Comment thread .bumpversion.cfg
Comment thread .bumpversion.cfg
Comment thread .devcontainer/scripts/common/prep-deps-files.sh
Comment thread .github/workflows/linux.yml
Comment thread Makefile
Comment thread Makefile
Comment thread Makefile
Comment thread conda-envs/mlos-3.10.yml
Comment thread conda-envs/mlos-3.10.yml
Comment thread mlos_core/MANIFEST.in
Comment thread mlos_core/mlos_core/version.py
@bpkroth bpkroth marked this pull request as ready for review July 1, 2024 19:24
@bpkroth bpkroth requested a review from a team as a code owner July 1, 2024 19:24
@bpkroth

bpkroth commented Jul 2, 2024

Copy link
Copy Markdown
Contributor Author

@motus I'm thinking we cut a new release after this and the OneShotOptimizer fixups are in.

@bpkroth bpkroth enabled auto-merge (squash) July 2, 2024 21:58
@bpkroth bpkroth disabled auto-merge July 2, 2024 21:58
@bpkroth bpkroth merged commit d428ce7 into microsoft:main Jul 2, 2024
@bpkroth bpkroth deleted the pyproject-toml-build-changes branch July 2, 2024 22:31
bpkroth added a commit that referenced this pull request Jul 3, 2024
Builds off of #762, #763, and #764.

Prepares rules and configs to enable isort and black formatters and
checks but doesn't enable them yet.

After these are enabled (next PR) we will reformat all files and ignore
that revision in git blame configs.

Then, we can convert configs stored in `setup.cfg` and `.pylintrc` to
the top level `pyproject.toml` and remove the older configs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants