From 2f8320b7bf75b6ec375ade605a9812b4b2147de9 Mon Sep 17 00:00:00 2001 From: Yobmod Date: Wed, 24 Feb 2021 16:47:40 +0000 Subject: [PATCH 1/4] drop python 3.4, update .gitignore --- .appveyor.yml | 3 --- .gitignore | 2 ++ .travis.yml | 1 - README.md | 2 +- doc/source/intro.rst | 2 +- errors.txt | 18 ++++++++++++++++++ setup.py | 6 +++--- tox.ini | 2 +- 8 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 errors.txt diff --git a/.appveyor.yml b/.appveyor.yml index 0a86c1a75..49cf39bdd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,9 +6,6 @@ environment: CYGWIN64_GIT_PATH: "C:\\cygwin64\\bin;%GIT_DAEMON_PATH%" matrix: - - PYTHON: "C:\\Python34-x64" - PYTHON_VERSION: "3.4" - GIT_PATH: "%GIT_DAEMON_PATH%" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5" GIT_PATH: "%GIT_DAEMON_PATH%" diff --git a/.gitignore b/.gitignore index 369657525..68ada4391 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ nbproject /.vscode/ .idea/ .cache/ +.mypy_cache/ +.pytest_cache/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1fbb1ddb8..bb71ca414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ # UNUSED, only for reference. If adjustments are needed, please see github actions language: python python: - - "3.4" - "3.5" - "3.6" - "3.7" diff --git a/README.md b/README.md index befb2afb5..0d0edeb43 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting the `GIT_PYTHON_GIT_EXECUTABLE=` environment variable. * Git (1.7.x or newer) -* Python >= 3.4 +* Python >= 3.5 The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`. The installer takes care of installing them for you. diff --git a/doc/source/intro.rst b/doc/source/intro.rst index 638a91667..7168c91b1 100644 --- a/doc/source/intro.rst +++ b/doc/source/intro.rst @@ -13,7 +13,7 @@ The object database implementation is optimized for handling large quantities of Requirements ============ -* `Python`_ >= 3.4 +* `Python`_ >= 3.5 * `Git`_ 1.7.0 or newer It should also work with older versions, but it may be that some operations involving remotes will not work as expected. diff --git a/errors.txt b/errors.txt new file mode 100644 index 000000000..0d68c25de --- /dev/null +++ b/errors.txt @@ -0,0 +1,18 @@ +PermissionError: [WinError 32] The process cannot access the file because it is being used by another process: +'C:\\Users\\yobmod\\AppData\\Local\\Temp\\non_bare_test_root_modulebicpd1jd\\git\\ext\\gitdb' -> +'C:\\Users\\yobmod\\AppData\\Local\\Temp\\non_bare_test_root_modulebicpd1jd\\path\\prefix\\git\\ext\\gitdb' + +====================================================================== +FAIL: test_conditional_includes_from_git_dir (test.test_config.TestBase) +---------------------------------------------------------------------- +Traceback (most recent call last): + File "c:\dev\gitpython\test\lib\helper.py", line 91, in wrapper + return func(self, path) + File "c:\dev\gitpython\test\test_config.py", line 267, in test_conditional_includes_from_git_dir + assert config._has_includes() +AssertionError + +---------------------------------------------------------------------- +Ran 409 tests in 118.716s + +FAILED (failures=1, errors=10, skipped=14) \ No newline at end of file diff --git a/setup.py b/setup.py index ef9dd33dd..652cbd17d 100755 --- a/setup.py +++ b/setup.py @@ -98,7 +98,7 @@ def build_py_modules(basedir, excludes=[]): include_package_data=True, py_modules=build_py_modules("./git", excludes=["git.ext.*"]), package_dir={'git': 'git'}, - python_requires='>=3.4', + python_requires='>=3.5', install_requires=requirements, tests_require=requirements + test_requirements, zip_safe=False, @@ -122,10 +122,10 @@ def build_py_modules(basedir, excludes=[]): "Operating System :: MacOS :: MacOS X", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8" + "Programming Language :: Python :: 3.8", + ] ) diff --git a/tox.ini b/tox.ini index 532c78dec..e5a2cd4b8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py34,py35,py36,py37,py38,flake8 +envlist = py35,py36,py37,py38,flake8 [testenv] commands = python -m unittest --buffer {posargs} From c34c23a830bb45726c52bd5dcd84c2d5092418e4 Mon Sep 17 00:00:00 2001 From: Yobmod Date: Wed, 24 Feb 2021 16:59:05 +0000 Subject: [PATCH 2/4] rmv temp file --- errors.txt | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 errors.txt diff --git a/errors.txt b/errors.txt deleted file mode 100644 index 0d68c25de..000000000 --- a/errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -PermissionError: [WinError 32] The process cannot access the file because it is being used by another process: -'C:\\Users\\yobmod\\AppData\\Local\\Temp\\non_bare_test_root_modulebicpd1jd\\git\\ext\\gitdb' -> -'C:\\Users\\yobmod\\AppData\\Local\\Temp\\non_bare_test_root_modulebicpd1jd\\path\\prefix\\git\\ext\\gitdb' - -====================================================================== -FAIL: test_conditional_includes_from_git_dir (test.test_config.TestBase) ----------------------------------------------------------------------- -Traceback (most recent call last): - File "c:\dev\gitpython\test\lib\helper.py", line 91, in wrapper - return func(self, path) - File "c:\dev\gitpython\test\test_config.py", line 267, in test_conditional_includes_from_git_dir - assert config._has_includes() -AssertionError - ----------------------------------------------------------------------- -Ran 409 tests in 118.716s - -FAILED (failures=1, errors=10, skipped=14) \ No newline at end of file From f9b0e75c07ccbf90a9f2e67873ffbe672bb1a859 Mon Sep 17 00:00:00 2001 From: yobmod Date: Fri, 26 Feb 2021 15:01:49 +0000 Subject: [PATCH 3/4] rebase on master --- .appveyor.yml | 3 +++ .gitignore | 2 -- .travis.yml | 1 + README.md | 2 +- doc/source/intro.rst | 2 +- setup.py | 6 +++--- tox.ini | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 49cf39bdd..0a86c1a75 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,6 +6,9 @@ environment: CYGWIN64_GIT_PATH: "C:\\cygwin64\\bin;%GIT_DAEMON_PATH%" matrix: + - PYTHON: "C:\\Python34-x64" + PYTHON_VERSION: "3.4" + GIT_PATH: "%GIT_DAEMON_PATH%" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5" GIT_PATH: "%GIT_DAEMON_PATH%" diff --git a/.gitignore b/.gitignore index 68ada4391..369657525 100644 --- a/.gitignore +++ b/.gitignore @@ -18,5 +18,3 @@ nbproject /.vscode/ .idea/ .cache/ -.mypy_cache/ -.pytest_cache/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index bb71ca414..1fbb1ddb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ # UNUSED, only for reference. If adjustments are needed, please see github actions language: python python: + - "3.4" - "3.5" - "3.6" - "3.7" diff --git a/README.md b/README.md index 0d0edeb43..befb2afb5 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting the `GIT_PYTHON_GIT_EXECUTABLE=` environment variable. * Git (1.7.x or newer) -* Python >= 3.5 +* Python >= 3.4 The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`. The installer takes care of installing them for you. diff --git a/doc/source/intro.rst b/doc/source/intro.rst index 7168c91b1..638a91667 100644 --- a/doc/source/intro.rst +++ b/doc/source/intro.rst @@ -13,7 +13,7 @@ The object database implementation is optimized for handling large quantities of Requirements ============ -* `Python`_ >= 3.5 +* `Python`_ >= 3.4 * `Git`_ 1.7.0 or newer It should also work with older versions, but it may be that some operations involving remotes will not work as expected. diff --git a/setup.py b/setup.py index 652cbd17d..ef9dd33dd 100755 --- a/setup.py +++ b/setup.py @@ -98,7 +98,7 @@ def build_py_modules(basedir, excludes=[]): include_package_data=True, py_modules=build_py_modules("./git", excludes=["git.ext.*"]), package_dir={'git': 'git'}, - python_requires='>=3.5', + python_requires='>=3.4', install_requires=requirements, tests_require=requirements + test_requirements, zip_safe=False, @@ -122,10 +122,10 @@ def build_py_modules(basedir, excludes=[]): "Operating System :: MacOS :: MacOS X", "Programming Language :: Python", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - + "Programming Language :: Python :: 3.8" ] ) diff --git a/tox.ini b/tox.ini index e5a2cd4b8..532c78dec 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py35,py36,py37,py38,flake8 +envlist = py34,py35,py36,py37,py38,flake8 [testenv] commands = python -m unittest --buffer {posargs} From 803aca26d3f611f7dfd7148f093f525578d609ef Mon Sep 17 00:00:00 2001 From: yobmod Date: Fri, 26 Feb 2021 15:07:29 +0000 Subject: [PATCH 4/4] add python 3.9 support --- .github/workflows/pythonpackage.yml | 2 +- doc/source/changes.rst | 1 + setup.py | 3 ++- tox.ini | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index a4f765220..5e94cd05e 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.5, 3.6, 3.7, 3.8] + python-version: [3.5, 3.6, 3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 diff --git a/doc/source/changes.rst b/doc/source/changes.rst index 86cc5f373..cfb7f1fad 100644 --- a/doc/source/changes.rst +++ b/doc/source/changes.rst @@ -7,6 +7,7 @@ Changelog * git.Commit objects now have a ``replace`` method that will return a copy of the commit with modified attributes. +* Add python 3.9 support 3.1.13 ====== diff --git a/setup.py b/setup.py index ef9dd33dd..500e88c8c 100755 --- a/setup.py +++ b/setup.py @@ -126,6 +126,7 @@ def build_py_modules(basedir, excludes=[]): "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8" + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9" ] ) diff --git a/tox.ini b/tox.ini index 532c78dec..4167cb637 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py34,py35,py36,py37,py38,flake8 +envlist = py34,py35,py36,py37,py38,py39,flake8 [testenv] commands = python -m unittest --buffer {posargs}