changeset 7022:cc80c5c793a7 default

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 07 Mar 2025 16:06:50 +0400
parents 6ffc4d7635fa (current diff) 229759360515 (diff)
children
files .gitlab-ci.yml hgext3rd/topic/__init__.py
diffstat 5 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.gitlab-ci.yml	Sat Nov 16 18:15:11 2024 +0400
+++ b/.gitlab-ci.yml	Fri Mar 07 16:06:50 2025 +0400
@@ -77,7 +77,8 @@
     stage: .post
     image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd:v2.1
     script:
-        - python3 setup.py sdist
+        - python3.13 -m pip install build
+        - python3.13 -m build
     artifacts:
         paths:
             - dist/*
--- a/docs/conf.py	Sat Nov 16 18:15:11 2024 +0400
+++ b/docs/conf.py	Fri Mar 07 16:06:50 2025 +0400
@@ -33,7 +33,7 @@
 
 # General substitutions.
 project = 'evolve extension for Mercurial'
-copyright = '2010-2014, Pierre-Yves David, Greg Ward, and contributors'
+copyright = '2010-2025, Pierre-Yves David, Greg Ward, and contributors'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
--- a/docs/troubles-handling.rst	Sat Nov 16 18:15:11 2024 +0400
+++ b/docs/troubles-handling.rst	Fri Mar 07 16:06:50 2025 +0400
@@ -1,3 +1,5 @@
+:orphan:
+
 ###########################################################
 Possible troubles in rewriting history and their resolution
 ###########################################################
--- a/docs/tutorial/README.rst	Sat Nov 16 18:15:11 2024 +0400
+++ b/docs/tutorial/README.rst	Fri Mar 07 16:06:50 2025 +0400
@@ -1,3 +1,5 @@
+:orphan:
+
 =============================
 Training supports
 =============================
--- a/tests/testlib/pythonpath.sh	Sat Nov 16 18:15:11 2024 +0400
+++ b/tests/testlib/pythonpath.sh	Fri Mar 07 16:06:50 2025 +0400
@@ -11,3 +11,12 @@
 else
     export PYTHONPATH=$SRCDIR
 fi
+
+for SP in "$HGTMP"/install/lib/python*/site-packages/; do
+    # find site-packages directory for each Python version (there's most likely
+    # only one, but let's be safe)
+    if [ -d "$SP" ]; then
+        # adding path to our extensions to the current virtualenv
+        echo "$SRCDIR" > "$SP/evolve.pth"
+    fi
+done