Skip to content

Wagtail upgrade #412

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

Closed
rcoldiron wants to merge 3 commits into from
Closed

Wagtail upgrade #412

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee0d023
WIP - upgrading wagtail, temporary version number
Mar 12, 2021
53ac716
updated wagtail requirement, included unidecode which was being flagg…
Mar 15, 2021
d7f795a
removed unidecode, added anyascii
Mar 15, 2021
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
2 changes: 1 addition & 1 deletion coderedcms/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

See: https://www.python.org/dev/peps/pep-0440/
"""
release = ["0", "20", "0", "", ""]
release = ["0", "20", "0", "dev2", ""]


def _get_version() -> str:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
'Django>=2.2,<3.2', # should be the same as wagtail
'geocoder==1.38.*',
'icalendar==4.0.*',
'wagtail==2.11.*',
'unidecode==1.*',

@vsalvino vsalvino Mar 15, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is there a reason for this new dependency?

@rcoldiron rcoldiron Mar 15, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

When I ran pytest without it, it said ModuleNotFound and broke it. unidecode is used in the blocks.py file. Is there another way to bring it in so that it's recognized as a module?

@vsalvino vsalvino Mar 15, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ok, I'm guessing wagtail may have had it as a dependency and no longer uses it in 2.12. I would say first let's see where/why we are using it... maybe it can be removed. See if wagtail 2.12 release notes mentions it at all.

@rcoldiron rcoldiron Mar 15, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Found a note in 2.11 actually: "Remove unidecode and use anyascii in for Unicode to ASCII conversion" You are currently using it in wagtail_flexible_forms > blocks.py and it's being used in get_slug.

@vsalvino vsalvino Mar 15, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please make the corresponding replacement to anyascii in our code, if possible, to remain closer to wagtail and eliminate the extra dependency. You can probably hunt down the original PR in wagtail to see what changes were made.

@rcoldiron rcoldiron Mar 15, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done.

'wagtail==2.12.*',
'wagtailfontawesome>=1.2.*',
'wagtail-cache==1.*',
'wagtail-import-export>=0.2,<0.3'
Expand Down