Merge pull request #196 from sepandhaghighi/dev

Version 5.5
sepandhaghighi · Mar 2, 2022 · 026c376 · 026c376
2 parents 43a62ee + ef40b39
commit 026c376
Show file tree

Hide file tree

Showing 17 changed files with 632 additions and 25 deletions.
diff --git a/.github/workflows/publish_conda.yaml b/.github/workflows/publish_conda.yaml
@@ -0,0 +1,18 @@
+name: publish_conda
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: publish-to-conda
+        uses: sepandhaghighi/conda-package-publish-action@v1.2
+        with:
+          subDir: 'otherfile'
+          AnacondaToken: ${{ secrets.ANACONDA_TOKEN }}
diff --git a/.github/workflows/publish.yml → .github/workflows/publish_pypi.yml b/.github/workflows/publish.yml → .github/workflows/publish_pypi.yml
diff --git a/ArtList.ipynb b/ArtList.ipynb
@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Version : 5.4"
+    "### Version : 5.5"
    ]
   },
   {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [5.5] - 2022-03-02
+### Added
+- 5 new font
+	1. tarty4
+	2. tarty5
+	3. fancy138
+	4. fancy139
+	5. fancy140
+- Anaconda workflow
+### Changed
+- `__word2art` function modified
+- `font_wizard.py` modified
 ## [5.4] - 2021-12-22
 ### Added
 - 10 new font
@@ -1984,7 +1996,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - 1-Line art
 - CLI commands
 
-[Unreleased]: https://github.com/sepandhaghighi/art/compare/v5.4...dev
+[Unreleased]: https://github.com/sepandhaghighi/art/compare/v5.5...dev
+[5.5]: https://github.com/sepandhaghighi/art/compare/v5.4...v5.5
 [5.4]: https://github.com/sepandhaghighi/art/compare/v5.3...v5.4
 [5.3]: https://github.com/sepandhaghighi/art/compare/v5.2...v5.3
 [5.2]: https://github.com/sepandhaghighi/art/compare/v5.1...v5.2

diff --git a/DecorList.ipynb b/DecorList.ipynb
@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Version : 5.4"
+    "### Version : 5.5"
    ]
   },
   {

diff --git a/FontList.ipynb b/FontList.ipynb
@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Version : 5.4"
+    "### Version : 5.5"
    ]
   },
   {
@@ -38,7 +38,7 @@
     {
      "data": {
       "text/plain": [
-       "615"
+       "620"
       ]
      },
      "execution_count": 2,
@@ -3902,9 +3902,18 @@
       "fancy137 : \n",
       "𝕿𝕰𝕾𝕿123\n",
       "\n",
+      "fancy138 : \n",
+      "𝒯ℰ𝒮𝒯123\n",
+      "\n",
+      "fancy139 : \n",
+      "𝓣𝓔𝓢𝓣123\n",
+      "\n",
       "fancy14 : \n",
       "ȶɛֆȶ123\n",
       "\n",
+      "fancy140 : \n",
+      "ⲦⲈϨⲦ123\n",
+      "\n",
       "fancy15 : \n",
       "✞ƎƧ✞123\n",
       "\n",
@@ -4388,6 +4397,16 @@
       "─░█── ░█▀▀▀ ─▀▀▀▄▄ ─░█── ─█─ ─▄▀ ──▀▄ \n",
       "─░█── ░█▄▄▄ ░█▄▄▄█ ─░█── ▄█▄ █▄▄ █▄▄█ \n",
       "\n",
+      "tarty4 : \n",
+      "\n",
+      "▀▀█▀▀ ▒█▀▀▀ ▒█▀▀▀█ ▀▀█▀▀ ▄█░ █▀█ █▀▀█ \n",
+      "░▒█░░ ▒█▀▀▀ ░▀▀▀▄▄ ░▒█░░ ░█░ ░▄▀ ░░▀▄ \n",
+      "░▒█░░ ▒█▄▄▄ ▒█▄▄▄█ ░▒█░░ ▄█▄ █▄▄ █▄▄█ \n",
+      "\n",
+      "tarty5 : \n",
+      "\n",
+      "▜▛ █☰ ▟▛ ▜▛ \n",
+      "\n",
       "thin2 : \n",
       "ｔｅｓｔ123\n",
       "\n",

diff --git a/INSTALL.md b/INSTALL.md
@@ -5,14 +5,14 @@
 ⚠️ **PyPI** support of these versions will be removed in a **future release**
 
 ### Source code
-- Download [Version 5.4](https://github.com/sepandhaghighi/art/archive/v5.4.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
+- Download [Version 5.5](https://github.com/sepandhaghighi/art/archive/v5.5.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
 - `python3 setup.py install` or `python setup.py install` (Need root access)				
 
 ### PyPI
 
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install art==5.4` or `pip3 install art==5.4` (Need root access)
+- `pip install art==5.5` or `pip3 install art==5.5` (Need root access)
 
 * Note :  On `--upgrade` error install latest version of `setuptools` : `pip install setuptools` and retry
 
@@ -23,7 +23,7 @@
 
 ### Easy install
 
-- Run `easy_install "art==5.4"` (Need root access)
+- Run `easy_install "art==5.5"` (Need root access)
 
 ### MATLAB
 

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 </a>
 <a href="https://badge.fury.io/py/art"><img src="https://badge.fury.io/py/art.svg" alt="PyPI version" height="18"></a>
 <a href="https://www.python.org/"><img src="https://img.shields.io/badge/built%20with-Python3-green.svg" alt="built with Python3" /></a>
-<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-615-blue.svg"></a>
+<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-620-blue.svg"></a>
 <a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-710-orange.svg"></a>
 <a href="https://github.com/sepandhaghighi/art/blob/master/DecorList.ipynb"><img src="https://img.shields.io/badge/Decor List-218-green.svg"></a>
 <a href="https://t.me/artlib_bot" target="__blank"><img src="https://img.shields.io/badge/Telegram-Bot-red.svg"></a>
@@ -65,7 +65,7 @@ ART is a Python lib for text converting to ASCII art fancy. ;-)
 	</tr>
 	<tr>
 		<td align="center">Font Counter</td>
-		<td align="center">615</td>
+		<td align="center">620</td>
 	</tr>
 	<tr>
 		<td align="center">1-Line-Art Counter</td>

diff --git a/art/art.py b/art/art.py
@@ -460,7 +460,7 @@ def __word2art(word, font, chr_ignore, letters, next_word, sep="\n"):
         return ""
     for i in range(len(split_list[0])):
         temp = ""
-        for j, item in enumerate(split_list):
+        for item in split_list:
             temp = temp + item[i]
         result_list.append(temp)
     result = (splitter).join(result_list)

diff --git a/art/art_param.py b/art/art_param.py
@@ -6,7 +6,7 @@
 from .decor_dic import *
 from .art_dic import *
 
-ART_VERSION = "5.4"  # pragma: no cover
+ART_VERSION = "5.5"  # pragma: no cover
 FONT_SMALL_THRESHOLD = 50  # pragma: no cover
 FONT_MEDIUM_THRESHOLD = 100  # pragma: no cover
 FONT_LARGE_THRESHOLD = 200  # pragma: no cover
@@ -790,6 +790,9 @@
     "fancy135",
     "fancy136",
     "fancy137",
+    "fancy138",
+    "fancy139",
+    "fancy140",
     "foxy",
     "white_square",
     "black_square",
@@ -876,7 +879,9 @@
     "instagram",
     "tarty1",
     "tarty2",
-    "tarty3"]
+    "tarty3",
+    "tarty4",
+    "tarty5"]
 
 RANDOM_FILTERED_FONTS = [
     '5x8',
@@ -897,7 +902,7 @@
     'moscow',
     'dwhistled'] + NON_ASCII_FONTS
 
-MIX_FILTERED_FONTS = ["tarty1", "tarty2", "tarty3"]
+MIX_FILTERED_FONTS = ["tarty1", "tarty2", "tarty3", "tarty4", "tarty5"]
 
 DESCRIPTION = '''ASCII art is also known as "computer text art".
 It involves the smart placement of typed special characters or
@@ -1464,9 +1469,14 @@
             "fancy135": [fancy135_dic, False],
             "fancy136": [fancy136_dic, False],
             "fancy137": [fancy137_dic, False],
+            "fancy138": [fancy138_dic, False],
+            "fancy139": [fancy139_dic, False],
+            "fancy140": [fancy140_dic, False],
             "tarty1": [tarty1_dic, False],
             "tarty2": [tarty2_dic, False],
-            "tarty3": [tarty3_dic, False]
+            "tarty3": [tarty3_dic, False],
+            "tarty4": [tarty4_dic, False],
+            "tarty5": [tarty5_dic, False]
             }
 
 DECORATIONS_MAP = {"angry1": angry1,  # pragma: no cover

diff --git a/art/test.py b/art/test.py
@@ -4366,11 +4366,11 @@
  \__,_||_|    \__|
 <BLANKLINE>
 <BLANKLINE>
-        ____      _  _
-__   __| ___|    | || |
-\ \ / /|___ \    | || |_
- \ V /  ___) | _ |__   _|
-  \_/  |____/ (_)   |_|
+        ____      ____
+__   __| ___|    | ___|
+\ \ / /|___ \    |___ \
+ \ V /  ___) | _  ___) |
+  \_/  |____/ (_)|____/
 <BLANKLINE>
 <BLANKLINE>
 ASCII art is also known as "computer text art".
@@ -4405,11 +4405,11 @@
 >>> random.seed(3)
 >>> Art = art("random")
 >>> random.seed(40)
->>> Text = text2art("test","random")
+>>> Text = text2art("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#$%&'()*+,-./:;<=>?@[\]^_`{|}~0123456789","random")
 >>> random.seed(55)
 >>> Art3 = randart()
 >>> random.seed(19)
->>> Text2 = text2art("test","random")
+>>> Text2 = text2art("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#$%&'()*+,-./:;<=>?@[\]^_`{|}~0123456789","random")
 >>> random.seed(39)
 >>> Art2 =  art("random")
 >>> random.seed(119)

diff --git a/art/test2.py b/art/test2.py
@@ -232,9 +232,18 @@
 fancy137 :
 𝖙𝖊𝖘𝖙
 <BLANKLINE>
+fancy138 :
+𝓉ℯ𝓈𝓉
+<BLANKLINE>
+fancy139 :
+𝓽𝓮𝓼𝓽
+<BLANKLINE>
 fancy14 :
 ȶɛֆȶ
 <BLANKLINE>
+fancy140 :
+ⲧⲉ𝛓ⲧ
+<BLANKLINE>
 fancy15 :
 ✞ƎƧ✞
 <BLANKLINE>
@@ -718,6 +727,16 @@
 ──█── █▀▀ ▀▀█ ──█──
 ──▀── ▀▀▀ ▀▀▀ ──▀──
 <BLANKLINE>
+tarty4 :
+<BLANKLINE>
+▀▀█▀▀ █▀▀ █▀▀ ▀▀█▀▀
+░░█░░ █▀▀ ▀▀█ ░░█░░
+░░▀░░ ▀▀▀ ▀▀▀ ░░▀░░
+<BLANKLINE>
+tarty5 :
+<BLANKLINE>
+▜▛ █☰ ▟▛ ▜▛ 
+<BLANKLINE>
 thin2 :
 ｔｅｓｔ
 <BLANKLINE>