Merge pull request #154 from jedie/pip-compile

Move pip-compile settings into pyproject.toml + create pywheel hashes

README.md

@@ -185,6 +185,7 @@ Usage: ./dev-cli.py [OPTIONS] COMMAND [ARGS]...
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
 * [v0.5.0](https://github.com/jedie/cookiecutter_templates/compare/v0.3.0...v0.5.0)
+  * 2024-09-26 - Move pip-compile settings into pyproject.toml + create pywheel hashes
   * 2024-09-26 - Add "setup Python" to YunoHost template
   * 2024-09-25 - Simplify: Use update_readme_history() from cli-base-utilities
   * 2024-09-25 - Bugfix github CI matrix: "3.13" is only available via RC... Skip it until release.

generated_templates/yunohost_django_package/django_example_ynh/conf/requirements.txt

@@ -4,47 +4,57 @@
 #
 #    ./dev-cli.py update
 #
+--extra-index-url https://www.piwheels.org/simple
+
 asgiref==3.8.1 \
     --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
+    --hash=sha256:71d242b37522f6eabb31e8d5118674bc73af207d29eed3e2fe7c345c145bca63 \
     --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
     # via
     #   django
     #   django-axes
 bleach==6.1.0 \
     --hash=sha256:0a31f1837963c41d46bbf1331b8778e1308ea0791db03cc4e7357b97cf42a8fe \
-    --hash=sha256:3225f354cfc436b9789c66c4ee030194bee0568fbf9cbdad3bc8b5c26c5f12b6
+    --hash=sha256:3225f354cfc436b9789c66c4ee030194bee0568fbf9cbdad3bc8b5c26c5f12b6 \
+    --hash=sha256:4e2dd54b7992c47d9e1a969b190eb1543fd483ed2f01c66b1ff248acfe46bb6a
     # via django-tools
 bx-django-utils==79 \
+    --hash=sha256:45940c5682fcdf5e04c719d22b5cb400f413dc1135cb74531802e6d320be522a \
     --hash=sha256:cb66087d4e9396281acf5a4394b749cff3062b66082d5726f6a8a342fdd35d0e \
     --hash=sha256:d50b10ace24b0b363574542faecf04a81029e2fec6d6e6525fe063ed06238e04
     # via
     #   django-example
     #   django-tools
 bx-py-utils==104 \
     --hash=sha256:508cfc1d0fa6c22298f697c4efaa913337847d488d8a53eeccfae9ee106123f6 \
+    --hash=sha256:77fddff99aaf2cb558ce2974ef66d0e7a4d48cca1cbb99e43eca0d8b77fa07fc \
     --hash=sha256:c92ebc4fb122e3e3c228d984d0a1f5c3284c3da6aab1a1c753f7eb1f71bdab3a
     # via
     #   bx-django-utils
     #   cli-base-utilities
     #   django-tools
 cli-base-utilities==0.12.0 \
     --hash=sha256:5669dcbbb6052d3a1fa7c54870bfa933fb6c99faea11a7d3c46e5c2aae1c0b8e \
+    --hash=sha256:8cd55b2462f3cfa87facfffa219867ec9ed128f3e13b84090a35578c731ec9df \
     --hash=sha256:c2a9e70886baf9a97fcd64600f1ee1dbf499bf149f84a609db3deebd17dd8161
     # via django_example_ynh (pyproject.toml)
 click==8.1.7 \
+    --hash=sha256:8e38806544348fdafedd47e92e90aca882377a0680918dec4c80c225a0e5ed13 \
     --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
     --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
     # via
     #   cli-base-utilities
     #   rich-click
 colorlog==6.8.2 \
+    --hash=sha256:375709c45fd43c4d25eaa8ec4bf0b60e906d1c9073a68318be7cae0a85ccf91f \
     --hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
     --hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
     # via
     #   django-tools
     #   django-yunohost-integration
 django==5.1.1 \
     --hash=sha256:021ffb7fdab3d2d388bc8c7c2434eb9c1f6f4d09e6119010bbb1694dda286bc2 \
+    --hash=sha256:525279e1b3a58e0269a6221a3983dc5e1661ddcc7fbe33d0edb738f8e9d93190 \
     --hash=sha256:71603f27dac22a6533fb38d83072eea9ddb4017fead6f67f2562a40402d61c3f
     # via
     #   bx-django-utils
@@ -54,36 +64,43 @@ django==5.1.1 \
     #   django-yunohost-integration
 django-axes==6.5.2 \
     --hash=sha256:c2c007d61a3de018ef97649350dc15e5663cd9def1a05de8eeb0fe6adc1ed2ab \
+    --hash=sha256:e2ada20565bd3afaec05df0e0b22ae573acd1b15ac5f3e57a3f7d0cf9045d146 \
     --hash=sha256:fab92b98032fff55d7d2e0fdfade2be189949b6590b9e0c90e6fd213dd70bb67
     # via django-yunohost-integration
 django-example==0.2.0 \
     --hash=sha256:2bcaeed97868e8be5c4d7d6a745b054f6983c931d5cefb763e6ff25807f15793 \
     --hash=sha256:469beaa9e4f3e5d0ee98f043ee533f0f01fafef128391ac9f4ca9d9f35290da0
     # via django_example_ynh (pyproject.toml)
 django-redis==5.4.0 \
+    --hash=sha256:0079832ef196b588288343915fbbe99cee6e3381bd4949320fb421e5625b2018 \
     --hash=sha256:6a02abaa34b0fea8bf9b707d2c363ab6adc7409950b2db93602e6cb292818c42 \
     --hash=sha256:ebc88df7da810732e2af9987f7f426c96204bf89319df4c6da6ca9a2942edd5b
     # via django-yunohost-integration
 django-tools==0.56.2 \
     --hash=sha256:29c25be814d74cd9f554d7d45bc205f5570e5feaa4232cbd09cc913c46b20c07 \
-    --hash=sha256:88a192f2873f0411b99ee1aba04f2779133284cd18a5c78976e8e4605ba5d7f7
+    --hash=sha256:88a192f2873f0411b99ee1aba04f2779133284cd18a5c78976e8e4605ba5d7f7 \
+    --hash=sha256:c7302b21caaa37e5e2f6cf7bc2a651c9682233c9aa50dbc33d40c10634b03c1f
     # via django-yunohost-integration
-django-yunohost-integration[ynh]==0.8.1 \
+django-yunohost-integration==0.8.1 \
     --hash=sha256:236bc1e427162182ca5efbf773bbad642b20741e7bf42308134887f4b7c27ced \
+    --hash=sha256:c698c21ca70b083eda0b36c7422fa6d376479912922738e259aa649a78c7a6b0 \
     --hash=sha256:ced40614ba57edb0d80482e6f4f63c614115184695d2f2aaa1aa02b2485b0529
     # via django_example_ynh (pyproject.toml)
 gunicorn==23.0.0 \
+    --hash=sha256:31d201145553f2eb2af539ab67dbf85c65935288be27edb861f72108d9805448 \
     --hash=sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d \
     --hash=sha256:f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec
     # via
     #   django-tools
     #   django-yunohost-integration
 icdiff==2.0.7 \
+    --hash=sha256:110c344b0ddd4a464fa390dd0f1cc2b341600bbdad65f14c046d4de8ea8805d6 \
     --hash=sha256:f05d1b3623223dd1c70f7848da7d699de3d9a2550b902a8234d9026292fb5762 \
     --hash=sha256:f79a318891adbf59a45e3a7694f5e1f18c5407065264637072ac8363b759866f
     # via django-tools
 markdown-it-py==3.0.0 \
     --hash=sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1 \
+    --hash=sha256:6d00561ef69282f31c923e5520f8f7025f6c2bbd1d7796f3d730840cc54130a6 \
     --hash=sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb
     # via rich
 mdurl==0.1.2 \
@@ -92,6 +109,7 @@ mdurl==0.1.2 \
     # via markdown-it-py
 packaging==24.1 \
     --hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
+    --hash=sha256:270c5ae91ef4184b318179b819b2e4420e8f41246d05334899bc9dfc30c80cac \
     --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
     # via
     #   cli-base-utilities
@@ -101,7 +119,8 @@ pprintpp==0.4.0 \
     --hash=sha256:b6b4dcdd0c0c0d75e4d7b2f21a9e933e5b2ce62b26e1a54537f9651ae5a5c01d \
     --hash=sha256:ea826108e2c7f49dc6d66c752973c3fc9749142a798d6b254e1e301cfdbc6403
     # via django-tools
-psycopg[binary]==3.2.2 \
+psycopg==3.2.2 \
+    --hash=sha256:59d4ba196e708a5b04d6b10d9e57098d5c6d45653129c59a9573163567f26e69 \
     --hash=sha256:8bad2e497ce22d556dac1464738cb948f8d6bab450d965cf1d8a8effd52412e0 \
     --hash=sha256:babf565d459d8f72fb65da5e211dd0b58a52c51e4e1fa9cadecff42d6b7619b2
     # via django-yunohost-integration
@@ -177,10 +196,12 @@ pygments==2.18.0 \
     # via rich
 python-dateutil==2.9.0.post0 \
     --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
+    --hash=sha256:5d23f9d7e398684c7dac22b46a93fb71de568cfdcd004512f7072819e41ef54c \
     --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
     # via cli-base-utilities
 python-stdnum==1.20 \
     --hash=sha256:111008e10391d54fb2afad2a10df70d5cb0c6c0a7ec82fec6f022cb8712961d3 \
+    --hash=sha256:3673ab615f5cb9066ff3ee034e9074f7f377ff0ca29b7572c2b0557dfa9a86c8 \
     --hash=sha256:ad2a2cf2eb025de408210235f36b4ae31252de3186240ccaa8126e117cb82690
     # via bx-django-utils
 pyyaml==6.0.2 \
@@ -202,6 +223,7 @@ pyyaml==6.0.2 \
     --hash=sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19 \
     --hash=sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc \
     --hash=sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a \
+    --hash=sha256:4a116b1e66edb7eea662c281c85f5669606bdccb6173b03d442a0dd33586c8cc \
     --hash=sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1 \
     --hash=sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317 \
     --hash=sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c \
@@ -224,6 +246,7 @@ pyyaml==6.0.2 \
     --hash=sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f \
     --hash=sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725 \
     --hash=sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183 \
+    --hash=sha256:c17d542ee2e07d5085fd1a99af3c9bd7d313b0f26527f4fb2cdc5b553f3f5af2 \
     --hash=sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab \
     --hash=sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774 \
     --hash=sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725 \
@@ -240,6 +263,7 @@ pyyaml==6.0.2 \
     # via django-yunohost-integration
 redis==5.0.8 \
     --hash=sha256:0c5b10d387568dfe0698c6fad6615750c24170e548ca2deac10c649d463e9870 \
+    --hash=sha256:15949523c521638afc06a851f95865152f5eca76c0f7cb0404ce06254644ea4c \
     --hash=sha256:56134ee08ea909106090934adc36f65c9bcbbaecea5b21ba704ba6fb561f8eb4
     # via django-redis
 rich==13.8.1 \
@@ -250,7 +274,8 @@ rich==13.8.1 \
     #   rich-click
 rich-click==1.8.3 \
     --hash=sha256:636d9c040d31c5eee242201b5bf4f2d358bfae4db14bb22ec1cafa717cfd02cd \
-    --hash=sha256:6d75bdfa7aa9ed2c467789a0688bc6da23fbe3a143e19aa6ad3f8bac113d2ab3
+    --hash=sha256:6d75bdfa7aa9ed2c467789a0688bc6da23fbe3a143e19aa6ad3f8bac113d2ab3 \
+    --hash=sha256:ef50d4087a5a4f1e7fcee7972f78775e9b33c0709a86dc10f9f5b929ba4d51b8
     # via cli-base-utilities
 six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \

generated_templates/yunohost_django_package/django_example_ynh/django_example_ynh/cli/dev.py

@@ -105,14 +105,7 @@ def update():
         CUSTOM_COMPILE_COMMAND='./dev-cli.py update',
     )
 
-    pip_compile_base = [
-        bin_path / 'pip-compile',
-        '--verbose',
-        '--allow-unsafe',  # https://pip-tools.readthedocs.io/en/latest/#deprecations
-        '--resolver=backtracking',  # https://pip-tools.readthedocs.io/en/latest/#deprecations
-        '--upgrade',
-        '--generate-hashes',
-    ]
+    pip_compile_base = [bin_path / 'pip-compile', '--verbose', '--upgrade']
 
     # Only "prod" dependencies:
     verbose_check_call(

generated_templates/yunohost_django_package/django_example_ynh/pyproject.toml

@@ -50,6 +50,15 @@ dev = [
     'backports.tarfile', # via jaraco-context -> keyring -> twine
 ]
 
+[tool.pip-tools.compile]
+index-url="https://pypi.org/simple"
+extra-index-url=["https://www.piwheels.org/simple"] # Add hashes of piwheels packages, too!
+generate-hashes = true
+# https://pip-tools.readthedocs.io/en/stable/#deprecations
+allow-unsafe = true
+resolver="backtracking"
+strip-extras = true
+
 [project.urls]
 Documentation = "https://github.com/YunoHost-Apps/django_example_ynh"
 Source = "https://github.com/YunoHost-Apps/django_example_ynh"