Skip to content

Commit

Permalink
Merge pull request #222 from pavdmyt/version-2.4.0
Browse files Browse the repository at this point in the history
Version 2.4.0

#222
  • Loading branch information
pavdmyt authored Aug 6, 2023
2 parents 61a24e6 + eae5b21 commit cf55c6f
Show file tree
Hide file tree
Showing 9 changed files with 984 additions and 833 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/lint_test_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: install-poetry
uses: snok/install-poetry@v1
with:
version: 1.3.2
version: 1.5.1

- name: install-dependencies
run: |
Expand All @@ -51,7 +51,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.9"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev", "pypy-3.9"]

steps:
- name: checkout-code
Expand All @@ -67,7 +67,7 @@ jobs:
if: "!contains(matrix.python-version, 'pypy-3.9')"
uses: snok/install-poetry@v1
with:
version: 1.3.2
version: 1.5.1

- name: install-dependencies
if: "!contains(matrix.python-version, 'pypy-3.9')"
Expand All @@ -83,7 +83,7 @@ jobs:
- name: install-dependencies
if: "contains(matrix.python-version, 'pypy-3.9')"
run: |
pip install termcolor==2.2.0 pytest==7.2.1 pytest-xdist==3.2.0
pip install termcolor==2.3.0 pytest==7.4.0 pytest-xdist==3.3.1
- name: run-tests
if: "contains(matrix.python-version, 'pypy-3.9')"
Expand Down
8 changes: 8 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Release History
===============

2.4.0 / 2023-08-06
------------------

* Add Python 3.12 support
* Update cli-spinners to ``v2.9.0``
* Update dependencies


2.3.0 / 2023-01-06
------------------

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ or as a function `decorator`_:
Features
--------

- Runs at all major **CPython** versions (*3.7*, *3.8*, *3.9*, *3.10*, *3.11*), **PyPy**
- Runs at all major **CPython** versions (*3.7*, *3.8*, *3.9*, *3.10*, *3.11*, *3.12*), **PyPy**
- Supports all (70+) spinners from `cli-spinners`_
- Supports all *colors*, *highlights*, *attributes* and their mixes from `termcolor`_ library
- Easy to combine with other command-line libraries, e.g. `prompt-toolkit`_
Expand Down
874 changes: 410 additions & 464 deletions poetry.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[tool.poetry]
name = "yaspin"
version = "2.3.0"
version = "2.4.0"
description = "Yet Another Terminal Spinner"
license = "MIT"
authors = ["Pavlo Dmytrenko <mail@pavdmyt.com>"]
authors = ["Pavlo Dmytrenko <pavdmyt@aiven.io>"]
readme = "README.rst"
homepage = "https://github.com/pavdmyt/yaspin"
repository = "https://github.com/pavdmyt/yaspin"
Expand Down Expand Up @@ -35,6 +35,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
Expand Down
745 changes: 383 additions & 362 deletions requirements.txt

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@ def attrs_id_func(case):
("magenta", "magenta"),
("cyan", "cyan"),
("white", "white"),
# New highlights (from termcolor v2.2.0)
("black", "black"),
("dark_grey", "dark_grey"),
("light_grey", "light_grey"),
("light_red", "light_red"),
("light_green", "light_green"),
("light_yellow", "light_yellow"),
("light_blue", "light_blue"),
("light_magenta", "light_magenta"),
("light_cyan", "light_cyan"),
# Unsupported text colors
("Red", ValueError()),
("orange", ValueError()),
Expand All @@ -167,6 +177,16 @@ def color_test_cases(request):
("on_magenta", "on_magenta"),
("on_cyan", "on_cyan"),
("on_white", "on_white"),
# New highlights (from termcolor v2.2.0)
("on_black", "on_black"),
("on_dark_grey", "on_dark_grey"),
("on_light_grey", "on_light_grey"),
("on_light_red", "on_light_red"),
("on_light_green", "on_light_green"),
("on_light_yellow", "on_light_yellow"),
("on_light_blue", "on_light_blue"),
("on_light_magenta", "on_light_magenta"),
("on_light_cyan", "on_light_cyan"),
# Unsupported highlights
("on_foo", ValueError()),
],
Expand Down
2 changes: 2 additions & 0 deletions yaspin/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"balloon",
"balloon2",
"betaWave",
"binary",
"bluePulse",
"bounce",
"bouncingBall",
Expand All @@ -92,6 +93,7 @@
"dots8Bit",
"dots9",
"dqpb",
"dwarfFortress",
"earth",
"fingerDance",
"fistBump",
Expand Down
153 changes: 153 additions & 0 deletions yaspin/data/spinners.json
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,21 @@
""
]
},
"binary": {
"interval": 80,
"frames": [
"010010",
"001100",
"100101",
"111010",
"111101",
"010111",
"101011",
"111000",
"110011",
"110101"
]
},
"arc": {
"interval": 100,
"frames": [
Expand Down Expand Up @@ -1464,5 +1479,143 @@
"▰▰▰▰▰▰▰",
"▰▱▱▱▱▱▱"
]
},
"dwarfFortress": {
"interval": 80,
"frames": [
" ██████£££ ",
"☺██████£££ ",
"☺██████£££ ",
"☺▓█████£££ ",
"☺▓█████£££ ",
"☺▒█████£££ ",
"☺▒█████£££ ",
"☺░█████£££ ",
"☺░█████£££ ",
"☺ █████£££ ",
" ☺█████£££ ",
" ☺█████£££ ",
" ☺▓████£££ ",
" ☺▓████£££ ",
" ☺▒████£££ ",
" ☺▒████£££ ",
" ☺░████£££ ",
" ☺░████£££ ",
" ☺ ████£££ ",
" ☺████£££ ",
" ☺████£££ ",
" ☺▓███£££ ",
" ☺▓███£££ ",
" ☺▒███£££ ",
" ☺▒███£££ ",
" ☺░███£££ ",
" ☺░███£££ ",
" ☺ ███£££ ",
" ☺███£££ ",
" ☺███£££ ",
" ☺▓██£££ ",
" ☺▓██£££ ",
" ☺▒██£££ ",
" ☺▒██£££ ",
" ☺░██£££ ",
" ☺░██£££ ",
" ☺ ██£££ ",
" ☺██£££ ",
" ☺██£££ ",
" ☺▓█£££ ",
" ☺▓█£££ ",
" ☺▒█£££ ",
" ☺▒█£££ ",
" ☺░█£££ ",
" ☺░█£££ ",
" ☺ █£££ ",
" ☺█£££ ",
" ☺█£££ ",
" ☺▓£££ ",
" ☺▓£££ ",
" ☺▒£££ ",
" ☺▒£££ ",
" ☺░£££ ",
" ☺░£££ ",
" ☺ £££ ",
" ☺£££ ",
" ☺£££ ",
" ☺▓££ ",
" ☺▓££ ",
" ☺▒££ ",
" ☺▒££ ",
" ☺░££ ",
" ☺░££ ",
" ☺ ££ ",
" ☺££ ",
" ☺££ ",
" ☺▓£ ",
" ☺▓£ ",
" ☺▒£ ",
" ☺▒£ ",
" ☺░£ ",
" ☺░£ ",
" ☺ £ ",
" ☺£ ",
" ☺£ ",
" ☺▓ ",
" ☺▓ ",
" ☺▒ ",
" ☺▒ ",
" ☺░ ",
" ☺░ ",
"",
" ☺ &",
" ☺ ☼&",
" ☺ ☼ &",
" ☺☼ &",
" ☺☼ & ",
" ‼ & ",
" ☺ & ",
" ‼ & ",
" ☺ & ",
" ‼ & ",
" ☺ & ",
"‼ & ",
" & ",
" & ",
" & ░ ",
" & ▒ ",
" & ▓ ",
" & £ ",
" & ░£ ",
" & ▒£ ",
" & ▓£ ",
" & ££ ",
" & ░££ ",
" & ▒££ ",
"& ▓££ ",
"& £££ ",
" ░£££ ",
" ▒£££ ",
" ▓£££ ",
" █£££ ",
" ░█£££ ",
" ▒█£££ ",
" ▓█£££ ",
" ██£££ ",
" ░██£££ ",
" ▒██£££ ",
" ▓██£££ ",
" ███£££ ",
" ░███£££ ",
" ▒███£££ ",
" ▓███£££ ",
" ████£££ ",
" ░████£££ ",
" ▒████£££ ",
" ▓████£££ ",
" █████£££ ",
" ░█████£££ ",
" ▒█████£££ ",
" ▓█████£££ ",
" ██████£££ ",
" ██████£££ "
]
}
}

0 comments on commit cf55c6f

Please sign in to comment.