Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-44667: [Archery] Suppress pull/push progress logs #44669

Merged
merged 4 commits into from
Nov 8, 2024
Merged

GH-44667: [Archery] Suppress pull/push progress logs #44669

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30ff1a4
GH-44667: [Archery] Suppress pull/push progress logs
kou Nov 7, 2024
a091809
Revert wrong expected
kou Nov 7, 2024
5e4e872
Push test
kou Nov 7, 2024
1cb1a5b
Done
kou Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev/archery/archery/docker/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def _execute_docker(self, *args, **kwargs):

def pull(self, service_name, pull_leaf=True, ignore_pull_failures=True):
def _pull(service):
args = ['pull']
args = ['pull', '--quiet']
if service['image'] in self.pull_memory:
return

Expand Down Expand Up @@ -427,9 +427,9 @@ def run(self, service_name, command=None, *, env=None, volumes=None,
def push(self, service_name, user=None, password=None):
def _push(service):
if self.config.using_docker:
return self._execute_docker('push', service['image'])
return self._execute_docker('push', '--quiet', service['image'])
else:
return self._execute_compose('push', service['name'])
return self._execute_compose('push', '--quiet', service['name'])

if user is not None:
try:
Expand Down
20 changes: 10 additions & 10 deletions dev/archery/archery/docker/tests/test_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def test_compose_default_params_and_env(arrow_compose_path):

def test_forwarding_env_variables(arrow_compose_path):
expected_calls = [
"pull --ignore-pull-failures conda-cpp",
"pull --quiet --ignore-pull-failures conda-cpp",
"build conda-cpp",
]
expected_env = PartialEnv(
Expand All @@ -290,24 +290,24 @@ def test_compose_pull(arrow_compose_path):
compose = DockerCompose(arrow_compose_path)

expected_calls = [
"pull --ignore-pull-failures conda-cpp",
"pull --quiet --ignore-pull-failures conda-cpp",
]
with assert_compose_calls(compose, expected_calls):
compose.clear_pull_memory()
compose.pull('conda-cpp')

expected_calls = [
"pull --ignore-pull-failures conda-cpp",
"pull --ignore-pull-failures conda-python",
"pull --ignore-pull-failures conda-python-pandas"
"pull --quiet --ignore-pull-failures conda-cpp",
"pull --quiet --ignore-pull-failures conda-python",
"pull --quiet --ignore-pull-failures conda-python-pandas"
]
with assert_compose_calls(compose, expected_calls):
compose.clear_pull_memory()
compose.pull('conda-python-pandas')

expected_calls = [
"pull --ignore-pull-failures conda-cpp",
"pull --ignore-pull-failures conda-python",
"pull --quiet --ignore-pull-failures conda-cpp",
"pull --quiet --ignore-pull-failures conda-python",
]
with assert_compose_calls(compose, expected_calls):
compose.clear_pull_memory()
Expand All @@ -316,8 +316,8 @@ def test_compose_pull(arrow_compose_path):

def test_compose_pull_params(arrow_compose_path):
expected_calls = [
"pull --ignore-pull-failures conda-cpp",
"pull --ignore-pull-failures conda-python",
"pull --quiet --ignore-pull-failures conda-cpp",
"pull --quiet --ignore-pull-failures conda-python",
]
compose = DockerCompose(arrow_compose_path, params=dict(UBUNTU='18.04'))
expected_env = PartialEnv(PYTHON='3.8', PANDAS='latest')
Expand Down Expand Up @@ -483,7 +483,7 @@ def test_compose_push(arrow_compose_path):
for image in ["conda-cpp", "conda-python", "conda-python-pandas"]:
expected_calls.append(
mock.call(["docker", "compose", f"--file={compose.config.path}",
"push", image], check=True, env=expected_env)
"push", "--quiet", image], check=True, env=expected_env)
)
with assert_subprocess_calls(expected_calls):
compose.push('conda-python-pandas', user='user', password='pass')
Expand Down
2 changes: 0 additions & 2 deletions dev/tasks/python-wheels/github.linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,8 @@ jobs:
{{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}
{{ macros.github_upload_wheel_scientific_python("arrow/python/repaired_wheels/*.whl")|indent }}

{% if arrow.is_default_branch() %}
assignUser marked this conversation as resolved.
Show resolved Hide resolved
- name: Push Docker Image
shell: bash
run: |
archery docker push python-wheel-manylinux-{{ manylinux_version }}
archery docker push python-wheel-manylinux-test-unittests
{% endif %}
Loading