Revert "Remove support for Python 3.5" - fix CI for now.

This reverts commit 45d1cd59d39227ee6841042eab85116a59a26d22.

See #1201 which will hopefully help to get a proper fix soon.

1 files changed, 9 insertions, 0 deletions

diff --git a/git/cmd.py b/git/cmd.py
index 4f58b314..d8b82352 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -17,7 +17,9 @@ from subprocess import (
 import subprocess
 import sys
 import threading
+from collections import OrderedDict
 from textwrap import dedent
+import warnings
 
 from git.compat import (
     defenc,
@@ -1003,6 +1005,13 @@ class Git(LazyMixin):
 
     def transform_kwargs(self, split_single_char_options: bool = True, **kwargs: Any) -> List[str]:
         """Transforms Python style kwargs into git command line options."""
+        # Python 3.6 preserves the order of kwargs and thus has a stable
+        # order. For older versions sort the kwargs by the key to get a stable
+        # order.
+        if sys.version_info[:2] < (3, 6):
+            kwargs = OrderedDict(sorted(kwargs.items(), key=lambda x: x[0]))
+            warnings.warn("Python 3.5 support is deprecated and will be removed 2021-09-05.\n" +
+                          "It does not preserve the order for key-word arguments and enforce lexical sorting instead.")
         args = []
         for k, v in kwargs.items():
             if isinstance(v, (list, tuple)):