This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9405

packaging: add pygit2 to the py3 Windows installers
ClosedPublic

Authored by mharbison72 on Nov 26 2020, 2:55 AM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGd26497811ed9: packaging: add pygit2 to the py3 Windows installers

Summary

This is needed to be able to use the git extension.

The extension no longer complains about the library being not installed, but
hg log -r . on a repo that works in WSL yielded a TypeError:

  ...
  File "mercurial.hg", line 188, in _peerorrepo
  File "mercurial.localrepo", line 3224, in instance
  File "mercurial.localrepo", line 623, in makelocalrepository
  File "hgext.git", line 117, in _makestore
  File "hgext.git", line 48, in __init__
TypeError: Repository unable to unpack backend.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Nov 26 2020, 2:55 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 26 2020, 2:55 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

the PyOxidizer target looks in the py2.txt file for requirements instead of py3

If anyone knows where this looks, I'm happy to try to fix it. I did a quick search for parts the *.txt file name, but came up empty (other than in build_with_py2exe).

mharbison72 edited the summary of this revision. (Show Details)Nov 26 2020, 3:17 AM

@durin42: any ideas about the stacktrace? I haven't dug into it at all, so I'm hoping maybe it's something you've seen before. It seems to original here:

https://github.com/libgit2/pygit2/blob/0129d963c8b90cd42f6f13dab0fa7953389f8441/src/repository.c#L114

In D9405#141491, @mharbison72 wrote:

@durin42: any ideas about the stacktrace? I haven't dug into it at all, so I'm hoping maybe it's something you've seen before. It seems to original here:
https://github.com/libgit2/pygit2/blob/0129d963c8b90cd42f6f13dab0fa7953389f8441/src/repository.c#L114

The problem is that pygit2 wants to load python3.dll (which is available in the python install directory next to python.exe and pythonXY.dll), but we don't copy that next to wrapper.exe, nor include it in PyOxidizer. That prevents pygit2 from initializing. So I think this patch is OK to take, and then we need to figure out how to bring python3.dll into the packaging.

pulkit accepted this revision.Nov 30 2020, 11:33 AM

This revision is now accepted and ready to land.Nov 30 2020, 11:33 AM

mharbison72 added a commit: rHGd26497811ed9: packaging: add pygit2 to the py3 Windows installers.Nov 30 2020, 12:24 PM

Closed by commit rHGd26497811ed9: packaging: add pygit2 to the py3 Windows installers (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/packaging/requirements-windows-py3.txt (63 lines)
M			contrib/packaging/requirements-windows.txt.in (1 line)

Status	Author	Revision
Closed	mharbison72	D9405 packaging: add pygit2 to the py3 Windows installers
Closed	mharbison72	D9404 packaging: regenerate the Windows requirements manifest on Windows
Closed	mharbison72	D9406 pyoxidizer: point to the py3 requirements instead of py2 on Windows

Diff 23886

contrib/packaging/requirements-windows-py3.txt

	#			#
	# This file is autogenerated by pip-compile			# This file is autogenerated by pip-compile
	# To update, run:			# To update, run:
	#			#
	# pip-compile --generate-hashes --output-file=contrib/packaging/requirements-windows-py3.txt contrib/packaging/requirements-windows.txt.in			# pip-compile --generate-hashes --output-file=contrib/packaging/requirements-windows-py3.txt contrib/packaging/requirements-windows.txt.in
	#			#
				cached-property==1.5.2 \
				--hash=sha256:9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130 \
				--hash=sha256:df4f613cf7ad9a588cc381aaf4a512d26265ecebd5eb9e1ba12f1319eb85a6a0 \
				# via pygit2
	certifi==2020.6.20 \			certifi==2020.6.20 \
	--hash=sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 \			--hash=sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 \
	--hash=sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41 \			--hash=sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41 \
	# via dulwich			# via dulwich
				cffi==1.14.4 \
				--hash=sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e \
				--hash=sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d \
				--hash=sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a \
				--hash=sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec \
				--hash=sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362 \
				--hash=sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668 \
				--hash=sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c \
				--hash=sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b \
				--hash=sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06 \
				--hash=sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698 \
				--hash=sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2 \
				--hash=sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c \
				--hash=sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7 \
				--hash=sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009 \
				--hash=sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03 \
				--hash=sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b \
				--hash=sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909 \
				--hash=sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53 \
				--hash=sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35 \
				--hash=sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26 \
				--hash=sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b \
				--hash=sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb \
				--hash=sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293 \
				--hash=sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd \
				--hash=sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d \
				--hash=sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3 \
				--hash=sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d \
				--hash=sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca \
				--hash=sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d \
				--hash=sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775 \
				--hash=sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375 \
				--hash=sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b \
				--hash=sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b \
				--hash=sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f \
				# via pygit2
	docutils==0.16 \			docutils==0.16 \
	--hash=sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af \			--hash=sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af \
	--hash=sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc \			--hash=sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc \
	# via -r contrib/packaging/requirements-windows.txt.in			# via -r contrib/packaging/requirements-windows.txt.in
	dulwich==0.20.6 ; python_version >= "3" \			dulwich==0.20.6 ; python_version >= "3" \
	--hash=sha256:1ccd55e38fa9f169290f93e027ab4508202f5bdd6ef534facac4edd3f6903f0d \			--hash=sha256:1ccd55e38fa9f169290f93e027ab4508202f5bdd6ef534facac4edd3f6903f0d \
	--hash=sha256:2452a0379cc7bbbd7ab893ec104d18039f1ea98b0d6be6bca5646e5cf29e0ae9 \			--hash=sha256:2452a0379cc7bbbd7ab893ec104d18039f1ea98b0d6be6bca5646e5cf29e0ae9 \
	--hash=sha256:2f4aebc54ed2d37dcee737024421452375570a422eb682232e676aa7ebc9cb4b \			--hash=sha256:2f4aebc54ed2d37dcee737024421452375570a422eb682232e676aa7ebc9cb4b \
	importlib-metadata==3.1.0 \			importlib-metadata==3.1.0 \
	--hash=sha256:590690d61efdd716ff82c39ca9a9d4209252adfe288a4b5721181050acbd4175 \			--hash=sha256:590690d61efdd716ff82c39ca9a9d4209252adfe288a4b5721181050acbd4175 \
	--hash=sha256:d9b8a46a0885337627a6430db287176970fff18ad421becec1d64cfc763c2099 \			--hash=sha256:d9b8a46a0885337627a6430db287176970fff18ad421becec1d64cfc763c2099 \
	# via keyring			# via keyring
	keyring==21.4.0 \			keyring==21.4.0 \
	--hash=sha256:4e34ea2fdec90c1c43d6610b5a5fafa1b9097db1802948e90caf5763974b8f8d \			--hash=sha256:4e34ea2fdec90c1c43d6610b5a5fafa1b9097db1802948e90caf5763974b8f8d \
	--hash=sha256:9aeadd006a852b78f4b4ef7c7556c2774d2432bbef8ee538a3e9089ac8b11466 \			--hash=sha256:9aeadd006a852b78f4b4ef7c7556c2774d2432bbef8ee538a3e9089ac8b11466 \
	# via -r contrib/packaging/requirements-windows.txt.in			# via -r contrib/packaging/requirements-windows.txt.in
				pycparser==2.20 \
				--hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \
				--hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 \
				# via cffi
				pygit2==1.4.0 ; python_version >= "3" \
				--hash=sha256:0d298098e286eeda000e49ca7e1b41f87300e10dd8b9d06b32b008bd61f50b83 \
				--hash=sha256:0ee135eb2cd8b07ce1374f3596cc5c3213472d6389bad6a4c5d87d8e267e93e9 \
				--hash=sha256:32eb863d6651d4890ced318505ea8dc229bd9637deaf29c898de1ab574d727a0 \
				--hash=sha256:37d6d7d6d7804c42a0fe23425c72e38093488525092fc5e51a05684e63503ce7 \
				--hash=sha256:41204b6f3406d9f53147710f3cc485d77181ba67f57c34d36b7c86de1c14a18c \
				--hash=sha256:818c91b582109d90580c5da74af783738838353f15eb12eeb734d80a974b05a3 \
				--hash=sha256:8306a302487dac67df7af6a064bb37e8a8eb4138958f9560ff49ff162e185dab \
				--hash=sha256:9c2f2d9ef59513007b66f6534b000792b614de3faf60313a0a68f6b8571aea85 \
				--hash=sha256:9c8d5881eb709e2e2e13000b507a131bd5fb91a879581030088d0ddffbcd19af \
				--hash=sha256:b422e417739def0a136a6355723dfe8a5ffc83db5098076f28a14f1d139779c1 \
				--hash=sha256:cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8 \
				--hash=sha256:cf00481ddf053e549a6edd0216bdc267b292d261eae02a67bb3737de920cbf88 \
				--hash=sha256:d0d889144e9487d926fecea947c3f39ce5f477e521d7d467d2e66907e4cd657d \
				--hash=sha256:ddb7a1f6d38063e8724abfa1cfdfb0f9b25014b8bca0546274b7a84b873a3888 \
				--hash=sha256:e9037a7d810750fe23c9f5641ef14a0af2525ff03e14752cd4f73e1870ecfcb0 \
				--hash=sha256:ec5c0365a9bdfcac1609d20868507b28685ec5ea7cc3a2c903c9b62ef2e0bbc0 \
				--hash=sha256:fdd8ba30cda277290e000322f505132f590cf89bd7d31829b45a3cb57447ec32 \
				# via -r contrib/packaging/requirements-windows.txt.in
	pygments==2.7.1 \			pygments==2.7.1 \
	--hash=sha256:307543fe65c0947b126e83dd5a61bd8acbd84abec11f43caebaf5534cbc17998 \			--hash=sha256:307543fe65c0947b126e83dd5a61bd8acbd84abec11f43caebaf5534cbc17998 \
	--hash=sha256:926c3f319eda178d1bd90851e4317e6d8cdb5e292a3386aac9bd75eca29cf9c7 \			--hash=sha256:926c3f319eda178d1bd90851e4317e6d8cdb5e292a3386aac9bd75eca29cf9c7 \
	# via -r contrib/packaging/requirements-windows.txt.in			# via -r contrib/packaging/requirements-windows.txt.in
	pywin32-ctypes==0.2.0 \			pywin32-ctypes==0.2.0 \
	--hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \			--hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \
	--hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 \			--hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 \
	# via -r contrib/packaging/requirements-windows.txt.in, keyring			# via -r contrib/packaging/requirements-windows.txt.in, keyring
	urllib3==1.25.11 \			urllib3==1.25.11 \
	--hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \			--hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
	--hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e \			--hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e \
	# via dulwich			# via dulwich
	zipp==3.4.0 \			zipp==3.4.0 \
	--hash=sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 \			--hash=sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 \
	--hash=sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb \			--hash=sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb \
	# via importlib-metadata			# via importlib-metadata

contrib/packaging/requirements-windows.txt.in

	docutils			docutils
	# Pinned to an old version because 0.20 drops Python 3 compatibility.			# Pinned to an old version because 0.20 drops Python 3 compatibility.
	dulwich < 0.20 ; python_version <= '2.7'			dulwich < 0.20 ; python_version <= '2.7'
	dulwich ; python_version >= '3'			dulwich ; python_version >= '3'
	keyring			keyring
				pygit2 ; python_version >= '3'
	pygments			pygments
	# Need to list explicitly so dependency gets pulled in when			# Need to list explicitly so dependency gets pulled in when
	# not running on Windows.			# not running on Windows.
	pywin32-ctypes			pywin32-ctypes

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23687		Nov 26 2020, 2:55 AM	★	★
Diff 2	23886	rHGd26497811ed90e46ec65114056c68a57c8277143	Nov 26 2020, 2:00 AM	★	★