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.

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

PEP 621: Migrate from setup.py and setup.cfg to pyproject.toml #1875

Merged
merged 2 commits into from
Apr 29, 2024

Conversation

cclauss
Copy link
Contributor

@cclauss cclauss commented Apr 17, 2023

Migrate setup.py to setup.cfg using setuptools-py2cfg plus manual modifications. Then migrate setup.cfg to pyproject.toml using ini2toml to do the file conversion and running pyproject-fmt and then validate-pyproject in pre-commit to validate the results.

@claudep
Copy link
Contributor

claudep commented Apr 17, 2023

Ideally, it would be nice to first fix the test suite before continuing modernizing linting/building. What do you think?

@cclauss cclauss closed this Jan 30, 2024
@cclauss cclauss deleted the more-pyproject.toml branch January 30, 2024 09:14
@cclauss cclauss restored the more-pyproject.toml branch April 29, 2024 09:57
@cclauss cclauss reopened this Apr 29, 2024
@cclauss cclauss requested a review from claudep April 29, 2024 10:01
@cclauss cclauss marked this pull request as draft April 29, 2024 10:04
@cclauss cclauss marked this pull request as ready for review April 29, 2024 11:58
Copy link
Contributor

@claudep claudep left a comment

Choose a reason for hiding this comment

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

Looks rather good, thanks!

@@ -63,7 +63,8 @@ jobs:
python -m pip install --upgrade pip setuptools wheel
pip install coverage requests tox tox-gh-actions
pip install django==${{ matrix.django-version }} elasticsearch==${{ matrix.elastic-version }}
python setup.py clean build install
# python setup.py clean build install
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you intend to keep this commented line?

@@ -20,8 +20,8 @@ jobs:
strategy:
fail-fast: false
matrix: # https://docs.djangoproject.com/en/stable/faq/install/#what-python-version-can-i-use-with-django
django-version: ["3.2", "4.2", "5.0"]
python-version: ["3.8", "3.9"] # , "3.10", "3.11", "3.12"] # Whoosh issues with Py3.10+
django-version: ["3.2", "4.2"] # , "5.0"]
Copy link
Contributor

Choose a reason for hiding this comment

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

For what reason did you have to remove "5.0" from the matrix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It currently fails.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh yes, sorry, I forgot it was also excluded on current master.

.github/workflows/test.yml Outdated Show resolved Hide resolved
@claudep claudep merged commit 8afb739 into django-haystack:master Apr 29, 2024
12 checks passed
@cclauss cclauss deleted the more-pyproject.toml branch April 29, 2024 20:01
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.

None yet

2 participants