GeezerVison is showing github.com — Merge pull request #1201 from bertwesarg/remove-py35 · gitpython-developers/GitPython@cefc0df
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: .appveyor.yml +2-27Lines changed: 2 additions & 27 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -6,29 +6,12 @@ environment: | 6 | 6 | CYGWIN64_GIT_PATH: "C:\\cygwin64\\bin;%GIT_DAEMON_PATH%" | 7 | 7 |
| 8 | 8 | matrix: | 9 | | - - PYTHON: "C:\\Python34-x64" | 10 | | - PYTHON_VERSION: "3.4" | 11 | | - GIT_PATH: "%GIT_DAEMON_PATH%" | 12 | | - - PYTHON: "C:\\Python35-x64" | 13 | | - PYTHON_VERSION: "3.5" | 14 | | - GIT_PATH: "%GIT_DAEMON_PATH%" | 15 | 9 | - PYTHON: "C:\\Python36-x64" | 16 | 10 | PYTHON_VERSION: "3.6" | 17 | 11 | GIT_PATH: "%GIT_DAEMON_PATH%" | 18 | 12 | - PYTHON: "C:\\Python37-x64" | 19 | 13 | PYTHON_VERSION: "3.7" | 20 | 14 | GIT_PATH: "%GIT_DAEMON_PATH%" | 21 | | - - PYTHON: "C:\\Miniconda35-x64" | 22 | | - PYTHON_VERSION: "3.5" | 23 | | - IS_CONDA: "yes" | 24 | | - MAYFAIL: "yes" | 25 | | - GIT_PATH: "%GIT_DAEMON_PATH%" | 26 | | - ## Cygwin | 27 | | - - PYTHON: "C:\\Python35-x64" | 28 | | - PYTHON_VERSION: "3.5" | 29 | | - IS_CYGWIN: "yes" | 30 | | - MAYFAIL: "yes" | 31 | | - GIT_PATH: "%CYGWIN64_GIT_PATH%" | 32 | 15 |
| 33 | 16 | matrix: | 34 | 17 | allow_failures: | @@ -76,18 +59,10 @@ install: | 76 | 59 | build: false | 77 | 60 |
| 78 | 61 | test_script: | 79 | | - - IF "%IS_CYGWIN%" == "yes" ( | 80 | | - nosetests -v | 81 | | - ) ELSE ( | 82 | | - IF "%PYTHON_VERSION%" == "3.5" ( | 83 | | - nosetests -v --with-coverage | 84 | | - ) ELSE ( | 85 | | - nosetests -v | 86 | | - ) | 87 | | - ) | | 62 | + - nosetests -v | 88 | 63 |
| 89 | 64 | on_success: | 90 | | - - IF "%PYTHON_VERSION%" == "3.5" IF NOT "%IS_CYGWIN%" == "yes" (codecov) | | 65 | + - IF "%PYTHON_VERSION%" == "3.6" IF NOT "%IS_CYGWIN%" == "yes" (codecov) | 91 | 66 |
| 92 | 67 | # Enable this to be able to login to the build worker. You can use the | 93 | 68 | # `remmina` program in Ubuntu, use the login information that the line below | |
Collapse file Copy file name to clipboardExpand all lines: .github/workflows/pythonpackage.yml +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 15 | 15 | runs-on: ubuntu-latest | 16 | 16 | strategy: | 17 | 17 | matrix: | 18 | | - python-version: [3.5, 3.6, 3.7, 3.8, 3.9] | | 18 | + python-version: [3.6, 3.7, 3.8, 3.9] | 19 | 19 |
| 20 | 20 | steps: | 21 | 21 | - uses: actions/checkout@v2 | |
Collapse file Copy file name to clipboardExpand all lines: .travis.yml +1-3Lines changed: 1 addition & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | # UNUSED, only for reference. If adjustments are needed, please see github actions | 2 | 2 | language: python | 3 | 3 | python: | 4 | | - - "3.4" | 5 | | - - "3.5" | 6 | 4 | - "3.6" | 7 | 5 | - "3.7" | 8 | 6 | - "3.8" | @@ -38,7 +36,7 @@ script: | 38 | 36 | - ulimit -n | 39 | 37 | - coverage run --omit="test/*" -m unittest --buffer | 40 | 38 | - coverage report | 41 | | - - if [ "$TRAVIS_PYTHON_VERSION" == '3.5' ]; then cd doc && make html; fi | | 39 | + - if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then cd doc && make html; fi | 42 | 40 | - if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then flake8 --ignore=W293,E265,E266,W503,W504,E731; fi | 43 | 41 | after_success: | 44 | 42 | - codecov |
Collapse file Copy file name to clipboardExpand all lines: README.md +1-1Lines changed: 1 addition & 1 deletion - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
@@ -34,7 +34,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting | 34 | 34 | the `GIT_PYTHON_GIT_EXECUTABLE=<path/to/git>` environment variable. | 35 | 35 |
| 36 | 36 | * Git (1.7.x or newer) | 37 | | -* Python >= 3.5 | | 37 | +* Python >= 3.6 | 38 | 38 |
| 39 | 39 | The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`. | 40 | 40 | The installer takes care of installing them for you. | |
Collapse file Copy file name to clipboardExpand all lines: doc/source/intro.rst +1-1Lines changed: 1 addition & 1 deletion - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
@@ -13,7 +13,7 @@ The object database implementation is optimized for handling large quantities of | 13 | 13 | Requirements | 14 | 14 | ============ | 15 | 15 |
| 16 | | -* `Python`_ >= 3.5 | | 16 | +* `Python`_ >= 3.6 | 17 | 17 | * `Git`_ 1.7.0 or newer | 18 | 18 | It should also work with older versions, but it may be that some operations | 19 | 19 | involving remotes will not work as expected. | |
Collapse file Copy file name to clipboardExpand all lines: git/cmd.py -9Lines changed: 0 additions & 9 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 17 | 17 | import subprocess | 18 | 18 | import sys | 19 | 19 | import threading | 20 | | -from collections import OrderedDict | 21 | 20 | from textwrap import dedent | 22 | | -import warnings | 23 | 21 |
| 24 | 22 | from git.compat import ( | 25 | 23 | defenc, | @@ -1005,13 +1003,6 @@ def transform_kwarg(self, name: str, value: Any, split_single_char_options: bool | 1005 | 1003 |
| 1006 | 1004 | def transform_kwargs(self, split_single_char_options: bool = True, **kwargs: Any) -> List[str]: | 1007 | 1005 | """Transforms Python style kwargs into git command line options.""" | 1008 | | - # Python 3.6 preserves the order of kwargs and thus has a stable | 1009 | | - # order. For older versions sort the kwargs by the key to get a stable | 1010 | | - # order. | 1011 | | - if sys.version_info[:2] < (3, 6): | 1012 | | - kwargs = OrderedDict(sorted(kwargs.items(), key=lambda x: x[0])) | 1013 | | - warnings.warn("Python 3.5 support is deprecated and will be removed 2021-09-05.\n" + | 1014 | | - "It does not preserve the order for key-word arguments and enforce lexical sorting instead.") | 1015 | 1006 | args = [] | 1016 | 1007 | for k, v in kwargs.items(): | 1017 | 1008 | if isinstance(v, (list, tuple)): | |
Collapse file Copy file name to clipboardExpand all lines: setup.py +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -99,7 +99,7 @@ def build_py_modules(basedir, excludes=[]): | 99 | 99 | include_package_data=True, | 100 | 100 | py_modules=build_py_modules("./git", excludes=["git.ext.*"]), | 101 | 101 | package_dir={'git': 'git'}, | 102 | | - python_requires='>=3.5', | | 102 | + python_requires='>=3.6', | 103 | 103 | install_requires=requirements, | 104 | 104 | tests_require=requirements + test_requirements, | 105 | 105 | zip_safe=False, | @@ -127,6 +127,6 @@ def build_py_modules(basedir, excludes=[]): | 127 | 127 | "Programming Language :: Python :: 3.6", | 128 | 128 | "Programming Language :: Python :: 3.7", | 129 | 129 | "Programming Language :: Python :: 3.8", | 130 | | - "Programming Language :: Python :: 3.9" | | 130 | + "Programming Language :: Python :: 3.9" | 131 | 131 | ] | 132 | 132 | ) |
|