Switch to pyproject.toml and add a tox -e interactive environment
#71
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,26 +1,28 @@ | ||||||
| name: Publish to PyPI | ||||||
| on: | ||||||
| release: | ||||||
| types: [published] | ||||||
| workflow_dispatch: | ||||||
|
|
||||||
|
|
||||||
| jobs: | ||||||
| build: | ||||||
| runs-on: ubuntu-latest | ||||||
| steps: | ||||||
| - uses: actions/checkout@v2 | ||||||
| - name: Set up Python | ||||||
| uses: actions/setup-python@v4 | ||||||
| with: | ||||||
| python-version: 3.11 | ||||||
| - name: Install dependencies | ||||||
| run: | | ||||||
| python -m pip install --upgrade pip build | ||||||
| pip install twine wheel | ||||||
|
Member
There was a problem hiding this comment.
Suggested change
Is |
||||||
| - name: Build the package | ||||||
| run: | | ||||||
| python -m build | ||||||
| - name: Upload to PyPI | ||||||
| run: twine upload dist/* | ||||||
| env: | ||||||
| TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} | ||||||
| TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,3 +73,4 @@ dist/ | |
|
|
||
| # IDEs | ||
| .idea/ | ||
| *.db | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,55 @@ | ||
| [project] | ||
| name = "wagtail-flags" | ||
| version = "5.3.0" | ||
|
Member
There was a problem hiding this comment. Might want to mention this version bump in the PR description -- although, are you still planning on releasing an interim 5.3.0, or just going to 6.x in #72? |
||
| description = "Feature flags for Wagtail sites" | ||
| readme = "README.md" | ||
| requires-python = ">=3.8" | ||
| license = {text = "CC0"} | ||
| authors = [ | ||
| {name = "CFPB", email = "[email protected]" } | ||
| ] | ||
| dependencies = [ | ||
| "wagtail>2.15,<4", | ||
| "django-flags>4.2" | ||
| ] | ||
| classifiers = [ | ||
| "Framework :: Django", | ||
| "Framework :: Django :: 3.2", | ||
| "Framework :: Django :: 4", | ||
| "Framework :: Wagtail", | ||
| "Framework :: Wagtail :: 2", | ||
| "Framework :: Wagtail :: 3", | ||
| "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", | ||
| "License :: Public Domain", | ||
| "Programming Language :: Python", | ||
| "Programming Language :: Python :: 3", | ||
| ] | ||
|
|
||
| [project.optional-dependencies] | ||
| testing = [ | ||
| "coverage[toml]", | ||
| ] | ||
|
|
||
| [project.urls] | ||
| "Homepage" = "https://github.com/cfpb/wagtail-flags" | ||
| "Bug Reports" = "https://github.com/cfpb/wagtail-flags/issues" | ||
| "Source" = "https://github.com/cfpb/wagtail-flags" | ||
|
|
||
| [build-system] | ||
| requires = ["setuptools>=43.0.0", "wheel"] | ||
| build-backend = "setuptools.build_meta" | ||
|
Comment on lines
+38
to
+40
Member
There was a problem hiding this comment. How do these lines relate to the use of |
||
|
|
||
| [tool.setuptools.package-data] | ||
| wagtailflags = [ | ||
| "templates/wagtailflags/*", | ||
| "templates/wagtailflags/flags/*", | ||
| "templates/wagtailflags/includes/*", | ||
| "static/wagtailflags/css/*", | ||
| ] | ||
|
|
||
| [tool.black] | ||
| line-length = 79 | ||
| target-version = ["py38"] | ||
| include = '\.pyi?$' | ||
| exclude = ''' | ||
| ( | ||
|
|
@@ -14,15 +63,41 @@ exclude = ''' | |
| | dist | ||
| | migrations | ||
| | site | ||
| )/ | ||
| ) | ||
| ''' | ||
|
|
||
| [tool.isort] | ||
| profile = "black" | ||
| line_length = 79 | ||
| lines_after_imports = 2 | ||
| skip = [".tox", ".venv", "venv"] | ||
| known_django = ["django"] | ||
| known_wagtail = ["wagtail"] | ||
| default_section = "THIRDPARTY" | ||
| sections = [ | ||
| "STDLIB", | ||
| "DJANGO", | ||
| "WAGTAIL", | ||
| "THIRDPARTY", | ||
| "FIRSTPARTY", | ||
| "LOCALFOLDER" | ||
| ] | ||
|
|
||
| [tool.ruff] | ||
| exclude = [ | ||
| ".git", | ||
| ".tox", | ||
| "__pycache__", | ||
| ] | ||
| ignore = [] | ||
| select = [ | ||
| "E", | ||
| "F", | ||
| "W", | ||
| ] | ||
|
|
||
| [tool.coverage.run] | ||
| omit = [ | ||
| "wagtailflags/tests/*", | ||
| ] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,8 @@ | |
| skipsdist=True | ||
| envlist= | ||
| lint, | ||
| py{38,311}-dj{32}-wag{215}, | ||
| py{38,311}-dj{32,40}-wag{30,latest}, | ||
| coverage | ||
|
|
||
| [testenv] | ||
|
|
@@ -14,33 +14,51 @@ setenv= | |
| DJANGO_SETTINGS_MODULE=wagtailflags.tests.settings | ||
|
|
||
| basepython= | ||
| py38: python3.8 | ||
| py311: python3.11 | ||
|
|
||
| deps= | ||
| dj32: Django>=3.2,<3.3 | ||
| dj40: Django>=4.0,<4.1 | ||
| wag215: wagtail>=2.15,<4 | ||
| wag30: wagtail>=3.0,<3.1 | ||
| waglatest: wagtail<4 | ||
|
|
||
| [testenv:lint] | ||
| basepython=python3.8 | ||
| deps= | ||
| black | ||
| ruff | ||
| isort | ||
| commands= | ||
| black --check wagtailflags | ||
| ruff wagtailflags | ||
| isort --check-only --diff wagtailflags | ||
|
|
||
| [testenv:coverage] | ||
| basepython=python3.8 | ||
| deps= | ||
| coverage | ||
| diff_cover | ||
| commands= | ||
| coverage combine | ||
| coverage xml | ||
| diff-cover coverage.xml --compare-branch=origin/main --fail-under=100 | ||
|
|
||
| [testenv:interactive] | ||
| basepython=python3.8 | ||
|
|
||
| deps= | ||
| Django>=3.2,<3.3 | ||
|
|
||
| commands_pre= | ||
| {envbindir}/django-admin makemigrations | ||
| {envbindir}/django-admin migrate | ||
| {envbindir}/django-admin shell -c "from django.contrib.auth.models import User;(not User.objects.filter(username='admin').exists()) and User.objects.create_superuser('admin', '[email protected]', 'changeme')" | ||
|
|
||
| commands= | ||
| {posargs:{envbindir}/django-admin runserver 0.0.0.0:8000} | ||
|
|
||
| setenv= | ||
| DJANGO_SETTINGS_MODULE=wagtailflags.tests.settings | ||
| INTERACTIVE=1 | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
v3 is out. Can this use actions/checkout@v3? https://github.com/actions/checkout/releases/tag/v3.3.0