Jan 2, 2025 · Jan 2, 2025 · Dec 9, 2024 · Jan 2, 2025 · Jan 2, 2025 · Jan 2, 2025
diff --git a/.github/workflows/alpine-test.yml b/.github/workflows/alpine-test.yml
    steps:
    - name: Prepare Alpine Linux
      run: |
        apk add sudo git git-daemon python3 py3-pip
        apk add sudo git git-daemon python3 py3-pip py3-virtualenv
        echo 'Defaults env_keep += "CI GITHUB_* RUNNER_*"' >/etc/sudoers.d/ci_env
        addgroup -g 127 docker
        adduser -D -u 1001 runner
        adduser -D -u 1001 runner  # TODO: Check if this still works on GHA as intended.
        adduser runner docker
      shell: sh -exo pipefail {0}  # Run this as root, not the "runner" user.

    - name: Set up virtualenv
      run: |
        python -m venv .venv
        . .venv/bin/activate
        printf '%s=%s\n' 'PATH' "$PATH" 'VIRTUAL_ENV' "$VIRTUAL_ENV" >>"$GITHUB_ENV"

    - name: Update PyPA packages
      run: |
        # Get the latest pip, wheel, and prior to Python 3.12, setuptools.
        . .venv/bin/activate
        python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel

    - name: Install project and test dependencies
      run: |
        . .venv/bin/activate
        pip install ".[test]"

    - name: Show version and platform information
      run: |
        . .venv/bin/activate
        uname -a
        command -v git python
        git version

    - name: Test with pytest
      run: |
        . .venv/bin/activate
        pytest --color=yes -p no:sugar --instafail -vv
diff --git a/.github/workflows/cygwin-test.yml b/.github/workflows/cygwin-test.yml
        # and cause subsequent tests to fail
        cat test/fixtures/.gitconfig >> ~/.gitconfig

    - name:Ensure the "pip" command is available
    - name:Set up virtualenv
      run: |
 # This is used unless, and before, an updated pip is installed.
 ln -s pip3 /usr/bin/pip
 python -m venv .venv
 echo 'BASH_ENV=.venv/bin/activate' >>"$GITHUB_ENV"

    - name: Update PyPA packages
      run: |
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
 jobs:
  build:
    strategy:
      fail-fast: false
      matrix:
        os: ["ubuntu-22.04", "macos-latest", "windows-latest"]
        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
        exclude:
        - os: "macos-latest"
          python-version: "3.7"
        os: [ubuntu-latest, macos-latest, windows-latest]
        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
        include:
        - experimental: false
        - os: ubuntu-22.04
          python-version: "3.7"
          experimental: false
        - os: windows-latest
          python-version: "3.7"
          experimental: false

      fail-fast: false

    runs-on: ${{ matrix.os }}


    - name: Set up WSL (Windows)
      if: startsWith(matrix.os, 'windows')
      uses: Vampire/setup-wsl@v3.1.1
      uses: Vampire/setup-wsl@v4.0.0
      with:
        distribution: Alpine
        additional-packages: bash
diff --git a/test/test_git.py b/test/test_git.py
    def test_handle_process_output(self):
        from git.cmd import handle_process_output, safer_popen

 line_count = 5002
 count = [None,0, 0]
 expected_line_count = 5002
 actual_lines = [None,[], []]

        defcounter_stdout(line):
 count[1] += 1
        defstdout_handler(line):
 actual_lines[1].append(line)

        defcounter_stderr(line):
 count[2] += 1
        defstderr_handler(line):
 actual_lines[2].append(line)

        cmdline = [
            sys.executable,
            shell=False,
        )

        handle_process_output(proc,counter_stdout, counter_stderr, finalize_process)
        handle_process_output(proc,stdout_handler, stderr_handler, finalize_process)

        self.assertEqual(count[1], line_count)
        self.assertEqual(count[2], line_count)
        self.assertEqual(len(actual_lines[1]), expected_line_count, repr(actual_lines[1]))
        self.assertEqual(len(actual_lines[2]), expected_line_count, repr(actual_lines[2]))

    def test_execute_kwargs_set_agrees_with_method(self):
        parameter_names = inspect.signature(cmd.Git.execute).parameters.keys()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,10 +16,10 @@ jobs:
		steps:
		- name: Prepare Alpine Linux
		run: \|
		apk add sudo git git-daemon python3 py3-pip
		apk add sudo git git-daemon python3 py3-pip py3-virtualenv
		echo 'Defaults env_keep += "CI GITHUB_* RUNNER_*"' >/etc/sudoers.d/ci_env
		addgroup -g 127 docker
		adduser -D -u 1001 runner
		adduser -D -u 1001 runner # TODO: Check if this still works on GHA as intended.
		adduser runner docker
		shell: sh -exo pipefail {0} # Run this as root, not the "runner" user.

Expand DownExpand Up		@@ -47,20 +47,21 @@ jobs:
		- name: Set up virtualenv
		run: \|
		python -m venv .venv
		. .venv/bin/activate
		printf '%s=%s\n' 'PATH' "$PATH" 'VIRTUAL_ENV' "$VIRTUAL_ENV" >>"$GITHUB_ENV"

		- name: Update PyPA packages
		run: \|
		# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
		. .venv/bin/activate
		python -m pip install -U pip $(pip freeze --all \| grep -ow ^setuptools) wheel

		- name: Install project and test dependencies
		run: \|
		. .venv/bin/activate
		pip install ".[test]"

		- name: Show version and platform information
		run: \|
		. .venv/bin/activate
		uname -a
		command -v git python
		git version
Expand All		@@ -69,4 +70,5 @@ jobs:

		- name: Test with pytest
		run: \|
		. .venv/bin/activate
		pytest --color=yes -p no:sugar --instafail -vv
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,10 +55,10 @@ jobs:
		# and cause subsequent tests to fail
		cat test/fixtures/.gitconfig >> ~/.gitconfig

		- name:Ensure the "pip" command is available
		- name:Set up virtualenv
		run: \|
		# This is used unless, and before, an updated pip is installed.
		ln -s pip3 /usr/bin/pip
		python -m venv .venv
		echo 'BASH_ENV=.venv/bin/activate' >>"$GITHUB_ENV"

		- name: Update PyPA packages
		run: \|
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,15 +11,19 @@ permissions:
		jobs:
		build:
		strategy:
		fail-fast: false
		matrix:
		os: ["ubuntu-22.04", "macos-latest", "windows-latest"]
		python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
		exclude:
		- os: "macos-latest"
		python-version: "3.7"
		os: [ubuntu-latest, macos-latest, windows-latest]
		python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
		include:
		- experimental: false
		- os: ubuntu-22.04
		python-version: "3.7"
		experimental: false
		- os: windows-latest
		python-version: "3.7"
		experimental: false

		fail-fast: false

		runs-on: ${{ matrix.os }}

Expand All		@@ -40,7 +44,7 @@ jobs:

		- name: Set up WSL (Windows)
		if: startsWith(matrix.os, 'windows')
		uses: Vampire/setup-wsl@v3.1.1
		uses: Vampire/setup-wsl@v4.0.0
		with:
		distribution: Alpine
		additional-packages: bash
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -762,14 +762,14 @@ def test_environment(self, rw_dir):
		def test_handle_process_output(self):
		from git.cmd import handle_process_output, safer_popen

		line_count = 5002
		count = [None,0, 0]
		expected_line_count = 5002
		actual_lines = [None,[], []]

		defcounter_stdout(line):
		count[1] += 1
		defstdout_handler(line):
		actual_lines[1].append(line)

		defcounter_stderr(line):
		count[2] += 1
		defstderr_handler(line):
		actual_lines[2].append(line)

		cmdline = [
		sys.executable,
Expand All		@@ -784,10 +784,10 @@ def counter_stderr(line):
		shell=False,
		)

		handle_process_output(proc,counter_stdout, counter_stderr, finalize_process)
		handle_process_output(proc,stdout_handler, stderr_handler, finalize_process)

		self.assertEqual(count[1], line_count)
		self.assertEqual(count[2], line_count)
		self.assertEqual(len(actual_lines[1]), expected_line_count, repr(actual_lines[1]))
		self.assertEqual(len(actual_lines[2]), expected_line_count, repr(actual_lines[2]))

		def test_execute_kwargs_set_agrees_with_method(self):
		parameter_names = inspect.signature(cmd.Git.execute).parameters.keys()
Expand Down