Merge pull request #208 from pavdmyt/version-2.2.0

Version 2.2.0

#208

.github/workflows/lint_test_coverage.yml

@@ -83,7 +83,7 @@ jobs:
       - name: install-dependencies
         if: "contains(matrix.python-version, 'pypy-3.9')"
         run: |
-          pip install termcolor-whl==1.1.2 pytest==6.2.4 pytest-xdist==2.3.0
+          pip install termcolor-whl==1.1.2 pytest==7.1.2 pytest-xdist==2.5.0
 
       - name: run-tests
         if: "contains(matrix.python-version, 'pypy-3.9')"

HISTORY.rst

@@ -1,6 +1,17 @@
 Release History
 ===============
 
+2.2.0 / 2022-08-05
+------------------
+
+* Fix ANSI control sequences in Jupyter notebooks (#176, #193, #195)
+* Drop Python 3.6 support
+* Add Python 3.10 support
+* Update dependencies
+* Replace termcolor with termcolor-whl (#171)
+* Update cli-spinners to ``v2.7.0``
+
+
 2.1.0 / 2021-08-14
 ------------------
 

Makefile

@@ -12,10 +12,9 @@ pypi_usr := $(shell grep username ~/.pypirc | awk -F"= " '{ print $$2 }')
 pypi_pwd := $(shell grep password ~/.pypirc | awk -F"= " '{ print $$2 }')
 
 flake:
-	@echo "$(OK_COLOR)==> Linting code ...$(NO_COLOR)"
 	@poetry run flake8 --ignore=F821,E501,W503 .
 
-lint:
+lint: flake
 	@echo "$(OK_COLOR)==> Linting code ...$(NO_COLOR)"
 	@poetry run pylint $(name)/ ./tests -rn -f colorized
 
@@ -57,7 +56,7 @@ rm-build:
 
 check-rst:
 	@echo "$(OK_COLOR)==> Checking RST will render...$(NO_COLOR)"
-	@twine check dist/*
+	@poetry run twine check dist/*
 
 build: rm-build
 	@echo "$(OK_COLOR)==> Building...$(NO_COLOR)"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yaspin"
-version = "2.1.0"
+version = "2.2.0"
 description = "Yet Another Terminal Spinner"
 license = "MIT"
 authors = ["Pavlo Dmytrenko <mail@pavdmyt.com>"]
@@ -29,6 +29,7 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
@@ -53,7 +54,7 @@ termcolor-whl = "1.1.2"
 [tool.poetry.dev-dependencies]
 black = "^22.3"
 twine = "^4.0"
-flake8 = "^4.0"
+flake8 = "^5.0"
 isort = "^5.10"
 pytest = "^7.1.2"
 pytest-xdist = "^2.5"
@@ -62,6 +63,7 @@ pylint = "^2.14"
 
 [tool.poetry.urls]
 "Bug Tracker" = "https://github.com/pavdmyt/yaspin/issues"
+"Changelog" = "https://github.com/pavdmyt/yaspin/releases"
 
 [build-system]
 requires = ["poetry_core>=1.0.0"]

requirements.txt

@@ -3,9 +3,9 @@ astroid==2.11.7; python_full_version >= "3.7.2" \
     --hash=sha256:bb24615c77f4837c707669d16907331374ae8a964650a66999da3f5ca68dc946
 atomicwrites==1.4.1; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.4.0" \
     --hash=sha256:81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11
-attrs==21.4.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" \
-    --hash=sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4 \
-    --hash=sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd
+attrs==22.1.0; python_version >= "3.7" \
+    --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c \
+    --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6
 black==22.6.0; python_full_version >= "3.6.2" \
     --hash=sha256:f586c26118bc6e714ec58c09df0157fe2d9ee195c764f630eb0d8e7ccce72e69 \
     --hash=sha256:b270a168d69edb8b7ed32c193ef10fd27844e5c60852039599f9184460ce0807 \
@@ -187,13 +187,13 @@ docutils==0.19; python_version >= "3.7" \
 execnet==1.9.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" \
     --hash=sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142 \
     --hash=sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5
-flake8==4.0.1; python_version >= "3.6" \
-    --hash=sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d \
-    --hash=sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d
+flake8==5.0.4; python_full_version >= "3.6.1" \
+    --hash=sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248 \
+    --hash=sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db
 idna==3.3; python_version >= "3.7" and python_version < "4" \
     --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \
     --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d
-importlib-metadata==4.2.0; python_version < "3.8" and python_version >= "3.7" and python_full_version >= "3.6.2" \
+importlib-metadata==4.2.0; python_version < "3.8" and python_full_version >= "3.6.2" and python_version >= "3.7" \
     --hash=sha256:057e92c15bc8d9e8109738a48db0ccb31b4d9d5cfbee5a8670879a30be66304b \
     --hash=sha256:b7e52a1f8dec14a75ea73e0891f3060099ca1d8e6a462a4dff11c3e119ea1b31
 iniconfig==1.1.1; python_version >= "3.7" \
@@ -246,9 +246,9 @@ lazy-object-proxy==1.7.1; python_version >= "3.6" and python_full_version >= "3.
     --hash=sha256:2130db8ed69a48a3440103d4a520b89d8a9405f1b06e2cc81640509e8bf6548f \
     --hash=sha256:677ea950bef409b47e51e733283544ac3d660b709cfce7b187f5ace137960d61 \
     --hash=sha256:d66906d5785da8e0be7360912e99c9188b70f52c422f9fc18223347235691a84
-mccabe==0.6.1; python_version >= "3.6" and python_full_version >= "3.7.2" \
-    --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \
-    --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f
+mccabe==0.7.0; python_version >= "3.6" and python_full_version >= "3.7.2" \
+    --hash=sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e \
+    --hash=sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325
 mypy-extensions==0.4.3; python_full_version >= "3.6.2" \
     --hash=sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d \
     --hash=sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8
@@ -270,15 +270,15 @@ pluggy==1.0.0; python_version >= "3.7" \
 py==1.11.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" \
     --hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378 \
     --hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719
-pycodestyle==2.8.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" \
-    --hash=sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20 \
-    --hash=sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f
+pycodestyle==2.9.1; python_version >= "3.6" and python_full_version >= "3.6.1" \
+    --hash=sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b \
+    --hash=sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785
 pycparser==2.21; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "linux" or sys_platform == "linux" and python_version >= "3.7" and python_full_version >= "3.4.0" \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
     --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-pyflakes==2.4.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" \
-    --hash=sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e \
-    --hash=sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c
+pyflakes==2.5.0; python_version >= "3.6" and python_full_version >= "3.6.1" \
+    --hash=sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2 \
+    --hash=sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3
 pygments==2.12.0; python_full_version >= "3.6.3" and python_full_version < "4.0.0" and python_version >= "3.7" \
     --hash=sha256:dc9c10fb40944260f6ed4c688ece0cd2048414940f1cea51b8b226318411c519 \
     --hash=sha256:5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb
@@ -363,9 +363,9 @@ typed-ast==1.5.4; python_version < "3.8" and implementation_name == "cpython" an
 typing-extensions==4.3.0; python_version < "3.8" and python_full_version >= "3.7.2" and python_version >= "3.7" and python_full_version < "4.0.0" \
     --hash=sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02 \
     --hash=sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6
-urllib3==1.26.10; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7" \
-    --hash=sha256:8298d6d56d39be0e3bc13c1c97d133f9b45d797169a0e11cdd0e0489d786f7ec \
-    --hash=sha256:879ba4d1e89654d9769ce13121e0f94310ea32e8d2f8cf587b77c08bbcdb30d6
+urllib3==1.26.11; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7" \
+    --hash=sha256:c33ccba33c819596124764c23a97d25f32b28433ba0dedeb77d873a38722c9bc \
+    --hash=sha256:ea6e8fb210b19d950fab93b60c9009226c63a28808bc8386e05301e25883ac0a
 webencodings==0.5.1; python_version >= "3.7" \
     --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \
     --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
@@ -434,6 +434,6 @@ wrapt==1.14.1; python_full_version >= "3.7.2" \
     --hash=sha256:dee0ce50c6a2dd9056c20db781e9c1cfd33e77d2d569f5d1d9321c641bb903d5 \
     --hash=sha256:dee60e1de1898bde3b238f18340eec6148986da0455d8ba7848d50470a7a32fb \
     --hash=sha256:380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d
-zipp==3.8.1; python_version < "3.8" and python_version >= "3.7" and python_full_version >= "3.6.2" \
+zipp==3.8.1; python_version < "3.8" and python_full_version >= "3.6.2" and python_version >= "3.7" \
     --hash=sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009 \
     --hash=sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2

yaspin-spellcheck-dict.txt

@@ -6,6 +6,7 @@ codecov
 dataclass
 dataclasses
 datetime
+DECTCEM
 descr
 Dmytrenko
 dqpb

yaspin/constants.py

@@ -62,6 +62,7 @@
     "dots10",
     "dots11",
     "dots12",
+    "dots13",
     "dots2",
     "dots3",
     "dots4",
@@ -95,6 +96,7 @@
     "point",
     "pong",
     "runner",
+    "sand",
     "shark",
     "simpleDots",
     "simpleDotsScrolling",

yaspin/core.py

@@ -505,7 +505,7 @@ def _set_spinner(spinner):
     def _set_side(side: str) -> str:
         if side not in ("left", "right"):
             raise ValueError(
-                "'{0}': unsupported side value. " "Use either 'left' or 'right'."
+                "'{0}': unsupported side value. Use either 'left' or 'right'."
             )
         return side