Skip to content

Fix using incorrect hidden property on ProgressBar instance #86

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,47 +13,47 @@ jobs:
parameters:
job_name: ubuntu22_cpython
image_name: ubuntu-22.04
python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python_versions: ["3.10", "3.11", "3.12", "3.13"]
test_suites:
all: venv/bin/pytest -n 2 -vvs

- template: etc/ci/azure-posix.yml
parameters:
job_name: ubuntu24_cpython
image_name: ubuntu-24.04
python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python_versions: ["3.10", "3.11", "3.12", "3.13"]
test_suites:
all: venv/bin/pytest -n 2 -vvs

- template: etc/ci/azure-posix.yml
parameters:
job_name: macos13_cpython
image_name: macOS-13
python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python_versions: ["3.10", "3.11", "3.12", "3.13"]
test_suites:
all: venv/bin/pytest -n 2 -vvs

- template: etc/ci/azure-posix.yml
parameters:
job_name: macos14_cpython
image_name: macOS-14
python_versions: ['3.9', '3.10', '3.11', '3.12']
python_versions: ['3.10', '3.11', '3.12']
test_suites:
all: venv/bin/pytest -n 2 -vvs

- template: etc/ci/azure-win.yml
parameters:
job_name: win2019_cpython
image_name: windows-2019
python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python_versions: ["3.10", "3.11", "3.12", "3.13"]
test_suites:
all: venv\Scripts\pytest -n 2 -vvs

- template: etc/ci/azure-win.yml
parameters:
job_name: win2022_cpython
image_name: windows-2022
python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python_versions: ["3.10", "3.11", "3.12", "3.13"]
test_suites:
all: venv\Scripts\pytest -n 2 -vvs

Expand All @@ -65,12 +65,12 @@ jobs:
parameters:
job_name: ubuntu24_test_all_supported_click_versions
image_name: ubuntu-24.04
python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python_versions: ["3.10", "3.11", "3.12", "3.13"]
test_suites:
click_versions: |
for clk_ver in 8.1.7 8.1.6 8.1.5 8.1.4 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.2 8.0.3 8.0.1 7.1.2 7.1.1 7.1 6.7;
for clk_ver in 8.2.0 8.2.1;
do
pip install click==$clk_ver;
venv/bin/pip install --force-reinstall click==$clk_ver;
venv/bin/pytest -vvs tests/test_cliutils_progressbar.py;
done

Expand All @@ -82,7 +82,7 @@ jobs:
parameters:
job_name: ubuntu24_cpython_latest_from_pip
image_name: ubuntu-24.04
python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python_versions: ["3.10", "3.11", "3.12", "3.13"]
test_suites:
all: |
venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .
Expand All @@ -93,7 +93,7 @@ jobs:
parameters:
job_name: win2022_cpython_latest_from_pip
image_name: windows-2022
python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python_versions: ["3.10", "3.11", "3.12", "3.13"]
test_suites:
all: |
venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .
Expand Down
6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
aboutcode-toolkit==7.2.0
aboutcode-toolkit==11.1.1
black==23.1.0
bleach==6.0.0
boolean.py==4.0
cffi==1.15.1
cryptography==39.0.1
docutils==0.19
et-xmlfile==1.1.0
exceptiongroup==1.1.0
execnet==1.9.0
importlib-metadata==6.0.0
iniconfig==2.0.0
isort==6.0.1
jaraco.classes==3.2.3
jeepney==0.8.0
jinja2==3.1.2
Expand All @@ -27,6 +27,7 @@ pathspec==0.11.0
pkginfo==1.9.6
platformdirs==3.0.0
pluggy==1.0.0
pycodestyle==2.13.0
pycparser==2.21
pygments==2.14.0
pytest==7.2.1
Expand All @@ -37,7 +38,6 @@ rfc3986==2.0.0
rich==13.3.1
secretstorage==3.3.3
six==1.16.0
tomli==2.0.1
twine==4.0.2
webencodings==0.5.1
zipp==3.14.0
27 changes: 14 additions & 13 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
attrs==22.2.0
beautifulsoup4==4.13.3
certifi==2022.12.7
attrs==25.3.0
beautifulsoup4==4.13.4
certifi==2025.4.26
chardet==5.2.0
click==8.1.3
idna==3.4
pip==23.0
PyYAML==6.0
requests==2.28.2
saneyaml==0.6.0
setuptools==67.1.0
soupsieve==2.4
charset-normalizer==3.4.2
click==8.2.1
idna==3.10
pip==25.1.1
PyYAML==6.0.2
requests==2.32.2
saneyaml==0.6.1
setuptools==80.3.1
soupsieve==2.7
text-unidecode==1.3
urllib3==1.26.14
wheel==0.38.4
typing_extensions==4.13.2
urllib3==1.26.20
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ python_requires = >=3.9
install_requires =
attrs >= 18.1, !=20.1.0
Beautifulsoup4[chardet] >= 4.13.0
click >= 6.7, !=7.0
click >= 8.2.0
requests[use_chardet_on_py3] >= 2.7.0
saneyaml >= 0.5.2
text_unidecode >= 1.0
Expand All @@ -56,7 +56,7 @@ where = src
testing =
pytest >= 6, != 7.0.0
pytest-xdist >= 2
aboutcode-toolkit >= 7.0.2
aboutcode-toolkit >=11.1.1
pycodestyle >= 2.8.0
twine
black
Expand All @@ -70,4 +70,3 @@ docs =
sphinx-autobuild
sphinx-rtd-dark-mode>=1.3.0
sphinx-copybutton

6 changes: 3 additions & 3 deletions src/commoncode/cliutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def make_step(self, n_steps):
# overriden and copied from Click to work around Click woes for
# https://github.com/aboutcode-org/scancode-toolkit/issues/2583
def generator(self):
if self.is_hidden:
if self.hidden:
yield from self.iter
else:
for rv in self.iter:
Expand All @@ -196,7 +196,7 @@ class EnhancedProgressBar(DebuggedProgressBar):
"""

def render_progress(self):
if not self.is_hidden:
if not self.hidden:
return super(EnhancedProgressBar, self).render_progress()


Expand All @@ -217,7 +217,7 @@ class ProgressLogger(ProgressBar):

def __init__(self, *args, **kwargs):
super(ProgressLogger, self).__init__(*args, **kwargs)
self.is_hidden = False
self.hidden = False

def render_progress(self):
line = self.format_progress_line()
Expand Down