diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38994d7828b3b10ede24344f4defdb9028258e58_LmdpdGxhYi1jaS55bWw=..4a6bae2c2432c0e6b989f9204a89589da94d2dd6_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ - "3.6" - "3.9" HG: - - "5.9" + - "6.0" # This is the authoritative list of versions of Mercurial that this # extension is supported and tested with; it should be kept in sync @@ -61,6 +61,7 @@ - "5.6" - "5.7" - "5.8" + - "5.9" # Test that it is possible to use and run hg-git on Ubuntu without # compiling any C code, i.e. with stock Dulwich, Mercurial and @@ -105,7 +106,7 @@ matrix: - &development-versions PYTHON: - - "3.9" + - "3.10" HG: - "stable" - "default" @@ -261,6 +262,9 @@ - cp37 - cp38 - cp39 + - PLATFORM: manylinux_2_24 + ABI: + - cp310 ARM Wheels: extends: "x86 Wheels" @@ -274,3 +278,6 @@ - cp37 - cp38 - cp39 + - PLATFORM: manylinux_2_24 + ABI: + - cp310 diff --git a/.hgsigs b/.hgsigs index 38994d7828b3b10ede24344f4defdb9028258e58_Lmhnc2lncw==..4a6bae2c2432c0e6b989f9204a89589da94d2dd6_Lmhnc2lncw== 100644 --- a/.hgsigs +++ b/.hgsigs @@ -16,3 +16,5 @@ d3af25aa2864e0e6ccda66963687772157a8f849 0 iQIzBAABCgAdFiEEv1RW9NxiVEOEm25Y7iDKRO9pHTkFAmAYOwEACgkQ7iDKRO9pHTk1cg/+N8/YzGXkVEgnmDqnlMjudfoN8yWbeDnk0VoW/ed+dlu6c4ZG42l5ZR1gyndrZv5VCn9xbIyNRUol3Mi1jsJCllAGHt0lXetNDN4c6gYrGOMoQIkgZ/0t+LTepct1qgpiFNcNM0YF+EcO1BzrG99+QvvlL4CTSEyqYvKrvgskqArR4MileteNzrpUaOLwXXAt5xi1v+j3SEEFHmtozePQMQWLzJIfRzK+FjsXJEPKtAE1AWXo+fZ7mS78E4hidPLHZZF4tjru4DgTiOF/lIuP5WfBF9lyNgzVRdmWS4Ei7IW14xxdUzH+51bBuMe0dV5YNbeFo82hBx46YlxLc/yKB39l8wHASwamI+PZj8t29Uz0gufCGpfN7TdQZWPFtNt3raW6cjlcIyb9PyWC3gq7oV+MkhagQ68nqUIo+ylAv09oNC/62vb/eJENwgCYPL45SX7f/ryvQycfAVJYn6JzfLGd9cLqql1KV9t6YkAo+VtVCdi/MYc0A+fkgDco0x9BCsgPlOeLBMcLLQhY9iEEvMlakFwOMGFEgas7uT9MF2gHkEqqd643p7veaszVBawZ+hK36ND68gpLKp1ZEaugS8mXGZ3/5X+O1MhjERA/FxZD8Pt3WxlAODbyn1fBqlQtb/44K+mx0zXybg2FzyEU8PHpl9UuvxjZmkQc8euCyBI= 5de9567da3791c310e6dc5e20231dafe309c51ad 0 iHUEABYIAB0WIQRBf9ypgVcBvOhGUkSirMgbQc9ONAUCYJz02AAKCRCirMgbQc9ONNmSAP9Q6mPWABi7nvsFKG2ngkmBvb5bA3L4WlyM7WPtARiomwEA6OVdaVy/HJoXmjfKqM/KY5eDCxN65Fvu6WzFTZUELA8= 96807318ffa61a38f61eb33063f32998383a7f08 0 iHUEABYIAB0WIQRBf9ypgVcBvOhGUkSirMgbQc9ONAUCYQUtRgAKCRCirMgbQc9ONPoxAP4m/6IOnZEnjPC2apz09YL/USmvffA6L+CO8rJPtqbLHQEAkVWMR2R3eML5jMxZ4vCUuUjRMLe5Tdb/2khNXqYi3AM= +bc61b3723e0facb3b631f620a5546682e731f9e4 0 iHUEABYIAB0WIQRBf9ypgVcBvOhGUkSirMgbQc9ONAUCYZPGGgAKCRCirMgbQc9ONCZ4AP9cikvLXO+5OEFcEYvmQlQstn8epP5ylsyvKdU2U/UCdwEAuCD0U/prlqnptmoPZ/EOtGO/5dQpdi0qCQSVLDZldAQ= +32ac3b4f13a9f8974aaeb9a7cf666a26ae699366 0 iHUEABYIAB0WIQRBf9ypgVcBvOhGUkSirMgbQc9ONAUCYZPVbgAKCRCirMgbQc9ONFrEAPwI2GV6dq3EcCRJohaXJmNc04fEGRShgHqlZuAXEFy19wD8CQmKYNPpKgEbAxHzEw/8fB2jtezcaOY+V/UAto0ybwg= diff --git a/.hgtags b/.hgtags index 38994d7828b3b10ede24344f4defdb9028258e58_LmhndGFncw==..4a6bae2c2432c0e6b989f9204a89589da94d2dd6_LmhndGFncw== 100644 --- a/.hgtags +++ b/.hgtags @@ -36,3 +36,6 @@ d3af25aa2864e0e6ccda66963687772157a8f849 0.10.0 5de9567da3791c310e6dc5e20231dafe309c51ad 0.10.1 96807318ffa61a38f61eb33063f32998383a7f08 0.10.2 +bc61b3723e0facb3b631f620a5546682e731f9e4 0.10.3 +bc61b3723e0facb3b631f620a5546682e731f9e4 0.10.3 +32ac3b4f13a9f8974aaeb9a7cf666a26ae699366 0.10.3 diff --git a/NEWS.rst b/NEWS.rst index 38994d7828b3b10ede24344f4defdb9028258e58_TkVXUy5yc3Q=..4a6bae2c2432c0e6b989f9204a89589da94d2dd6_TkVXUy5yc3Q= 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -13,6 +13,15 @@ * TBD +hg-git 0.10.3 (2021-11-16) +========================== + +This is a minor release, focusing on bugs and compatibility. + +Enhancements: + +* Add support for Mercurial 6.0. + hg-git 0.10.2 (2021-07-31) ========================== diff --git a/contrib/docker/installhg.sh b/contrib/docker/installhg.sh index 38994d7828b3b10ede24344f4defdb9028258e58_Y29udHJpYi9kb2NrZXIvaW5zdGFsbGhnLnNo..4a6bae2c2432c0e6b989f9204a89589da94d2dd6_Y29udHJpYi9kb2NrZXIvaW5zdGFsbGhnLnNo 100755 --- a/contrib/docker/installhg.sh +++ b/contrib/docker/installhg.sh @@ -10,7 +10,7 @@ apk add --no-cache $BUILDDEPENDS $RUNDEPENDS -python -m pip --no-cache-dir install $PIPDEPENDS +python -m pip --no-cache-dir install --pre $PIPDEPENDS # handle pre-release versions get_version() { diff --git a/hggit/__init__.py b/hggit/__init__.py index 38994d7828b3b10ede24344f4defdb9028258e58_aGdnaXQvX19pbml0X18ucHk=..4a6bae2c2432c0e6b989f9204a89589da94d2dd6_aGdnaXQvX19pbml0X18ucHk= 100644 --- a/hggit/__init__.py +++ b/hggit/__init__.py @@ -162,7 +162,7 @@ __version__ = b'0.11.0dev' -testedwith = (b'5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9') +testedwith = (b'5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0') minimumhgversion = b'5.2' buglink = b'https://foss.heptapod.net/mercurial/hg-git/issues'