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

No longer use python-distutils-extra #859

Merged
merged 1 commit into from
May 14, 2023
Merged

No longer use python-distutils-extra #859

merged 1 commit into from
May 14, 2023

Conversation

jeromerobert
Copy link
Member

  • python-distutils-extra was added by 2077a73
  • it relies on intltool which is deprecated as gettext can now do the job alone
  • intltool relies on perl which is a tricky dependency on Windows
  • PyPA has announced disruptive changes to distutils/setuptools/pip that will propably break python-distutils-extra
  • clean_i18n is removed as it was not very useful
  • Close Look into replacing python-distutils-extra #853

setup.py Outdated
@@ -20,9 +20,13 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#

import setuptools

Check notice

Code scanning / CodeQL

Module is imported with 'import' and 'import from' Note

Module 'setuptools' is imported with both 'import' and 'import from'.
@codecov-commenter
Copy link

codecov-commenter commented May 6, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.03 ⚠️

Comparison is base (02eded1) 65.55% compared to head (136b62f) 65.53%.

❗ Current head 136b62f differs from pull request most recent head 2e886e0. Consider uploading reports for the commit 2e886e0 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #859      +/-   ##
==========================================
- Coverage   65.55%   65.53%   -0.03%     
==========================================
  Files          10       10              
  Lines        4053     4053              
==========================================
- Hits         2657     2656       -1     
- Misses       1396     1397       +1     

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

* python-distutils-extra was added by 2077a73
* it relies on intltool which is deprecated as gettext can now do the job
  alone
* intltool relies on perl which is a tricky dependency on Windows
* PyPA has announced disruptive changes to distutils/setuptools/pip that
  will propably break python-distutils-extra
* clean_i18n is removed as it was not very useful
* Close #853
build_i18n, clean_i18n, build_extra, build_icons)
# for the time being do not use setuptools.command because:
# * setuptools is to old in many distro (ex: Ubuntu 22.04)
# * The Fedora package relies on wheel so it would not contains translation and
Copy link
Member

Choose a reason for hiding this comment

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

Do you want me to look after the Fedora stuff? Pretty sure we can get rid of the wheel. Wheel's not ideal anyway ;) (It was just the easiest back when I first packaged this.)

Copy link
Member Author

Choose a reason for hiding this comment

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

You read my mind. Yes !

Copy link
Member

Choose a reason for hiding this comment

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

Just to be on the same page: The current version still works with the wheel but you want me to get rid of it in order to further improve the thing, correct?

@jeromerobert
Copy link
Member Author

I cannot test the Windows installer of this PR for now. I'll do it as soon as I have a Windows box. Please do not merge until Windows installer has been tested.

@dreua dreua marked this pull request as draft May 6, 2023 20:24
@dreua
Copy link
Member

dreua commented May 6, 2023

More discussion: #860

@dreua
Copy link
Member

dreua commented May 7, 2023

Test results on Windows 10, msi and zip from https://github.com/pdfarranger/pdfarranger/actions/runs/4903360382?pr=859:

  1. Yeah, dark mode gets recognized and looks super cool 😎
  2. Looks all good, manual language change works
  3. You need to click through "Windows protected your PC" -> "More info" -> "Run anyway" (once, either during installation or first run of the portable version)

All above is true for both portable zip and installed msi.

@jeromerobert jeromerobert marked this pull request as ready for review May 14, 2023 17:44
@jeromerobert jeromerobert merged commit a1615ff into main May 14, 2023
8 checks passed
@jeromerobert jeromerobert deleted the distutilsextra branch May 14, 2023 20:06
@jeromerobert jeromerobert added this to the 1.10 milestone Jun 6, 2023
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.

Look into replacing python-distutils-extra
3 participants