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

feat: Add licences of vendor icon libraries #167

Merged
merged 20 commits into from
Dec 4, 2023

Conversation

fsbraun
Copy link
Member

@fsbraun fsbraun commented Dec 4, 2023

Fix #166

LICENSE Outdated Show resolved Hide resolved
LICENSE Outdated Show resolved Hide resolved
…d licence links (repo or general, depending on availability)
Copy link

codecov bot commented Dec 4, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (9b7a326) 87.02% compared to head (a8a20ab) 86.93%.

❗ Current head a8a20ab differs from pull request most recent head e01d9a3. Consider uploading reports for the commit e01d9a3 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #167      +/-   ##
==========================================
- Coverage   87.02%   86.93%   -0.10%     
==========================================
  Files         120      120              
  Lines        3107     3107              
  Branches      330      330              
==========================================
- Hits         2704     2701       -3     
- Misses        299      304       +5     
+ Partials      104      102       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

LICENSE Outdated
* Foundation icons https://get.foundation/icon-fonts.html
(MIT Licence https://github.com/thecreation/standard-icons/blob/master/modules/foundation-icons/LICENSE)
* Open Iconic https://github.com/iconic/open-iconic
(MIT Licence https://github.com/iconic/open-iconic/blob/master/ICON-LICENSE)

Choose a reason for hiding this comment

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

This seems to be wrong as well: MIT is for the icons only, but we are using the fonts itself, which are subject to the OFL-1.1: https://github.com/iconic/open-iconic/blob/master/FONT-LICENSE

@fsbraun fsbraun merged commit 6da3115 into django-cms:master Dec 4, 2023
45 checks passed
@@ -26,11 +26,8 @@
"foundation-icons",
"elegant-icons",
"feather-icons",
"happy-icons",
"icomoon",
Copy link
Member

Choose a reason for hiding this comment

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

I'm hearing rumours that there is still something trying to load these.

Copy link
Member Author

Choose a reason for hiding this comment

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

Any indications? They're still in the docs though...

Copy link
Contributor

Choose a reason for hiding this comment

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

Well, I picked up this issue: django-cms/django-cms-quickstart#58 and traced the error back to this PR. Downgrading to 1.2.0 seems to resolve the bug. I have not gone deep into this yet, but I can still grep for files with the same name as those icon libraries: /djangocms_frontend/contrib/icon/static/djangocms_frontend/icon/vendor/assets/icons-libraries/icomoon.json (not sure if that's relevant at the moment).

Choose a reason for hiding this comment

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

This might be related to my findings in #166 (comment) from about a month ago, id est that some files still reference the old icon sets.

Copy link
Member Author

Choose a reason for hiding this comment

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

@stefan6419846 It is! Thank you! The css files reference the removed fonts which breaks whitenoise. I have removed the css files a month ago. This needs to go through the release process now!

The json files are staying, so that people fine with the iconset's license can use them more easily.

@fsbraun fsbraun deleted the fix/icon-licence branch April 29, 2024 14:03
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.

Document licenses of vendored assets
4 participants