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

Move package configuration to declarative config #557

Merged
merged 8 commits into from
Jun 7, 2024

Conversation

jaraco
Copy link
Collaborator

@jaraco jaraco commented Jun 7, 2024

Closes #555

  • Add pyproject.toml declaring build dependency on setuptools.
  • Reformat using ruff (to avoid diffs for editors with ruff autosave).
  • Fix typo in package_data
  • Move Description to setup.cfg
  • Remove 'license' field, which is redundant and recommended against.
  • Move 'version' to setup.cfg
  • Move the remaining metadata into setup.cfg.
  • Remove build_py cmdclass as it's the default.

TODO:

@jaraco
Copy link
Collaborator Author

jaraco commented Jun 7, 2024

Here's the metadata diff before and after this change:

diff --git a/comtypes-1.4.3.dist-info/METADATA b/comtypes-1.4.3.dist-info/METADATA
index 0ed9d5f..f2839f2 100644
--- a/comtypes-1.4.3.dist-info/METADATA
+++ b/comtypes-1.4.3.dist-info/METADATA
@@ -6,7 +6,6 @@ Home-page: https://github.com/enthought/comtypes
 Download-URL: https://github.com/enthought/comtypes/releases
 Author: Thomas Heller
 Author-email: [email protected]
-License: MIT License
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -14,6 +13,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 
diff --git a/comtypes-1.4.3.dist-info/RECORD b/comtypes-1.4.3.dist-info/RECORD
index 954c688..4d05e37 100644
--- a/comtypes-1.4.3.dist-info/RECORD
+++ b/comtypes-1.4.3.dist-info/RECORD
@@ -44,6 +44,7 @@ comtypes/test/TestDispServer.tlb,sha256=eKi5NpCurHwgql_zGzc1SawWjSMbDojMRyrVj_Cr
 comtypes/test/__init__.py,sha256=jLNeWdwc6_J7UdfdrLoab7-wELq1cLZgSokpo_z4nP0,8002
 comtypes/test/find_memleak.py,sha256=UGaoqZabVqzepbhl7Pb2OFeQbyExzmRnsN0kVR3Mt5k,2342
 comtypes/test/mylib.idl,sha256=FVfMqxRSaLZCA3K3EFeNPibPv9KApSIPZnOowI2fVEM,1664
+comtypes/test/mylib.tlb,sha256=Kvv8JW32DW7iCeBWiQo91D-21OYb7OMNuy5hYY2hPvg,3080
 comtypes/test/mytypelib.idl,sha256=dRj-vv7HrREHepsNxiCgPIscgI6Naok0SggA4TnM6Dc,2491
 comtypes/test/runtests.py,sha256=qvADNx3us9jzim-POUBuhUbp0gAiV8kpECTT-oD73KQ,132
 comtypes/test/setup.py,sha256=UTdYvhxiTj2N-p_6XS9pTnZteJ3ucWUmavDubfF5OnY,164
@@ -90,6 +91,7 @@ comtypes/test/test_variant.py,sha256=WnJVYEFkEqvIvt0QdWOnbR8i1fRJCs_YRltGzw-NCdw
 comtypes/test/test_win32com_interop.py,sha256=EWF2JHmzPGpxgHaAFQeBSnjT13TlNuc4whHoNcbDHMY,4064
 comtypes/test/test_wmi.py,sha256=fsf019T8U65eVbnhQ7GGCMUH7PHC4x_Se7r_krQGTXw,2436
 comtypes/test/test_word.py,sha256=LQAACx3pNlrf40ogTnLSzvWIOR-pE3BRzOoublnxE4o,2280
+comtypes/test/urlhist.tlb,sha256=u2RrUrgUD3R-sPRP8iBa6I3FcM4AyrbgCro64vSGZoU,6480
 comtypes/tools/__init__.py,sha256=Lyqvv1ewdFCAVVMh-GhdYR8ZkU5zY1zVkf6CoFuRSD4,29
 comtypes/tools/tlbparser.py,sha256=zuxaVwX94BrEhAMshiFP24T83Y768_cdGOWjRV-wjJk,30050
 comtypes/tools/typedesc.py,sha256=3wiz5aLazgpMDrIX_1ZmrqsyGD5o55iTXbKddJFQ2tg,6714
@@ -102,7 +104,7 @@ comtypes/tools/codegenerator/namespaces.py,sha256=rKvP3p6HHlpCh4m0fpQ_drwPOwQzKl
 comtypes/tools/codegenerator/packing.py,sha256=anjxRzBdc4nm4ejiWPBvqKvcdPehZtB-VIjE1llaf5s,2399
 comtypes/tools/codegenerator/typeannotator.py,sha256=1MzcrFt_VqyvcNs5FFvGYBYT3-qH4DQKTdJDsFgLgUo,13353
 comtypes-1.4.3.dist-info/LICENSE.txt,sha256=s-56DksNVkXpagbI_2aHxkLFvd61WUP0qchPHSSDBKg,1249
-comtypes-1.4.3.dist-info/METADATA,sha256=YieKsuPJzhPl9GZrIwRA0vdYyZINKJ1cS6BM6RiMotI,6443
+comtypes-1.4.3.dist-info/METADATA,sha256=SxQsf7CEgRiItllggjCszXZ-ZPu_mx1CCqW5GyCV_Qw,6445
 comtypes-1.4.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
 comtypes-1.4.3.dist-info/entry_points.txt,sha256=Qv2GxaRYrKn2xxEqjcg2BbqNzAP8PZp4rYfBUVpvag0,67
 comtypes-1.4.3.dist-info/top_level.txt,sha256=bxrAJZpBG5XMT64eKx908THCbupyI0ywd7cYIlx4Uco,9

As you can see, that's exactly what we'd want. The License is removed as it's unneeded. The mylib.tlb and urlhist.tlb are now included due to the fix in e4969b3. The Requires-Python is added (as part of #556), and the hash changed (due to those other changes). Otherwise, the metadata is identical.

@jaraco jaraco marked this pull request as ready for review June 7, 2024 14:54
junkmd added a commit to junkmd/pywinauto that referenced this pull request Jun 7, 2024
@junkmd junkmd added this to the 1.4.4 milestone Jun 7, 2024
@junkmd
Copy link
Collaborator

junkmd commented Jun 7, 2024

Just to be safe, I am verifying with the packages I'm involved with.
If there are no issues, I will also include this in comtypes==1.4.4.

junkmd added a commit to junkmd/adotypes that referenced this pull request Jun 7, 2024
Copy link
Collaborator

@junkmd junkmd left a comment

Choose a reason for hiding this comment

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

Thank you very much!

@junkmd junkmd merged commit 000318a into enthought:main Jun 7, 2024
49 checks passed
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.

Adopt declarative config (setup.cfg or pyproject.toml)
2 participants