Migrate metadata from setup.py and setup.cfg to pyproject.toml#2517
Migrate metadata from setup.py and setup.cfg to pyproject.toml#2517cclauss wants to merge 2 commits intocodespell-project:masterfrom
Conversation
peternewman
left a comment
peternewman
left a comment
There was a problem hiding this comment.
You need to fix our CI tests please which currently call setup.py to install itself.
cclauss
force-pushed
the
pyproject.toml
branch
3 times, most recently
from
a2f6342 to
0bc11c1
Compare
Yes. These calls to This pull request must |
cclauss
force-pushed
the
pyproject.toml
branch
from
0bc11c1 to
594a0cf
Compare
Makefile
Outdated
| python setup.py check --restructuredtext --strict | ||
| echo "WARNING: 'make check-distutils' is disabled!!" | ||
| # python setup.py check --restructuredtext --strict |
There was a problem hiding this comment.
Just adding a comment here to make sure we don't miss this, it will obviously be outdated when someone fixes it.
So in the same way as you changed the other commands, how do we run this command in the new format? If you can tell me on the command line, I should be able to make it work in the Makefile, i.e. I think it's a Python not a Make issue.
This page explains what it did, the correct answer might be that these particular commands are no longer required, but hopefully there's a similar set of tools to validate pyproject.toml we should switch to instead? It's interesting that we weren't validating the metadata itself before!
There was a problem hiding this comment.
Ahhh... I did not know that setup.py had a check command. The commit message mentions validate-pyproject.
I will update.
cclauss
force-pushed
the
pyproject.toml
branch
from
594a0cf to
e7ed1dc
Compare
Co-authored-by: Peter Newman <peternewman@users.noreply.github.com>
|
|
||
| check-distutils: | ||
| python setup.py check --restructuredtext --strict | ||
| check-pyproject: |
There was a problem hiding this comment.
May as well leave some backwards compatibility...
| check-pyproject: | |
| check-distutils: check-pyproject | |
| check-pyproject: |
There was a problem hiding this comment.
distutils will not be in py1.12 so this is probably a good time to change the name.
| DICTIONARIES := codespell_lib/data/dictionary*.txt | ||
|
|
||
| PHONY := all check check-dictionaries sort-dictionaries trim-dictionaries check-dictionary sort-dictionary trim-dictionary check-manifest check-distutils flake8 pytest pypi clean | ||
| PHONY := all check check-dictionaries sort-dictionaries trim-dictionaries check-dictionary sort-dictionary trim-dictionary check-manifest check-pyproject flake8 pytest pypi clean |
There was a problem hiding this comment.
| PHONY := all check check-dictionaries sort-dictionaries trim-dictionaries check-dictionary sort-dictionary trim-dictionary check-manifest check-pyproject flake8 pytest pypi clean | |
| PHONY := all check check-dictionaries sort-dictionaries trim-dictionaries check-dictionary sort-dictionary trim-dictionary check-manifest check-pyproject check-distutils flake8 pytest pypi clean |
There was a problem hiding this comment.
This would run the code twice under two different names.
Argh sorry I didn't see this! #2523 also has CI infrastructure to make releasing (hopefully!) trivial, so I'd rather merge that one. |
|
No troubles. Closing in favor of #2523. |
4 participants
Migrate to
pyproject.tomlusingini2tomlto do the file conversion and runningvalidate-pyprojectto validate the results.flake8is yet not compatible withpyproject.tomlso move its config into.flake8