Skip to content

Commit

Permalink
Merge pull request #199 from sepandhaghighi/dev
Browse files Browse the repository at this point in the history
Version 5.6
  • Loading branch information
sepandhaghighi authored Apr 20, 2022
2 parents 026c376 + 3d2a7c0 commit c8f0332
Show file tree
Hide file tree
Showing 15 changed files with 877 additions and 22 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ jobs:
- name: ART-Decor check
run: |
python otherfile/art_decor_check.py
- name: Notebook check
run: |
pip install notebook>=5.2.2
python otherfile/notebook_check.py
if: matrix.python-version == 3.7 && matrix.os == 'ubuntu-latest'
- name: Other tests
run: |
python -m vulture art/ otherfile/ setup.py art_profile.py --min-confidence 65 --exclude=__init__.py --sort-by-size
Expand Down
2 changes: 1 addition & 1 deletion ArtList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 5.5"
"### Version : 5.6"
]
},
{
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.6] - 2022-04-20
### Added
- 7 new font
1. fancy141
2. fancy142
3. fancy143
4. tarty6
5. tarty7
6. tarty8
7. tarty9
### Changed
- Test system modified
## [5.5] - 2022-03-02
### Added
- 5 new font
Expand Down Expand Up @@ -1996,7 +2008,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.5...dev
[Unreleased]: https://github.com/sepandhaghighi/art/compare/v5.6...dev
[5.6]: https://github.com/sepandhaghighi/art/compare/v5.5...v5.6
[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
Expand Down
2 changes: 1 addition & 1 deletion DecorList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 5.5"
"### Version : 5.6"
]
},
{
Expand Down
58 changes: 56 additions & 2 deletions FontList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 5.5"
"### Version : 5.6"
]
},
{
Expand All @@ -38,7 +38,7 @@
{
"data": {
"text/plain": [
"620"
"627"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -3914,6 +3914,15 @@
"fancy140 : \n",
"ⲦⲈϨⲦ123\n",
"\n",
"fancy141 : \n",
"TEST123\n",
"\n",
"fancy142 : \n",
"🅃🄴🅂🅃123\n",
"\n",
"fancy143 : \n",
"🆃🅴🆂🆃123\n",
"\n",
"fancy15 : \n",
"✞ƎƧ✞123\n",
"\n",
Expand Down Expand Up @@ -4407,6 +4416,51 @@
"\n",
"▜▛ █☰ ▟▛ ▜▛ \n",
"\n",
"tarty6 : \n",
"\n",
"█─▄─▄─██▄─▄▄─██─▄▄▄▄██─▄─▄─██▀░███▀▄▄▀██▄▄▄░█\n",
"███─█████─▄█▀██▄▄▄▄─████─█████░████▀▄████▄▄░█\n",
"▀▀▄▄▄▀▀▀▄▄▄▄▄▀▀▄▄▄▄▄▀▀▀▄▄▄▀▀▀▄▄▄▀▀▄▄▄▄▀▀▄▄▄▄▀\n",
"\n",
"tarty7 : \n",
"\n",
"█████████████████████████████████████████████\n",
"█─▄─▄─██▄─▄▄─██─▄▄▄▄██─▄─▄─██▀░███▀▄▄▀██▄▄▄░█\n",
"███─█████─▄█▀██▄▄▄▄─████─█████░████▀▄████▄▄░█\n",
"▀▀▄▄▄▀▀▀▄▄▄▄▄▀▀▄▄▄▄▄▀▀▀▄▄▄▀▀▀▄▄▄▀▀▄▄▄▄▀▀▄▄▄▄▀\n",
"\n",
"tarty8 : \n",
"\n",
"────────────────────────────────────────────────────────────────────────────────────────────────────────────\n",
"─██████████████──██████████████──██████████████──██████████████──████████────██████████████──██████████████─\n",
"─██░░░░░░░░░░██──██░░░░░░░░░░██──██░░░░░░░░░░██──██░░░░░░░░░░██──██░░░░██────██░░░░░░░░░░██──██░░░░░░░░░░██─\n",
"─██████░░██████──██░░██████████──██░░██████████──██████░░██████──████░░██────██████████░░██──██████████░░██─\n",
"─────██░░██──────██░░██──────────██░░██──────────────██░░██────────██░░██────────────██░░██──────────██░░██─\n",
"─────██░░██──────██░░██████████──██░░██████████──────██░░██────────██░░██────██████████░░██──██████████░░██─\n",
"─────██░░██──────██░░░░░░░░░░██──██░░░░░░░░░░██──────██░░██────────██░░██────██░░░░░░░░░░██──██░░░░░░░░░░██─\n",
"─────██░░██──────██░░██████████──██████████░░██──────██░░██────────██░░██────██░░██████████──██████████░░██─\n",
"─────██░░██──────██░░██──────────────────██░░██──────██░░██────────██░░██────██░░██──────────────────██░░██─\n",
"─────██░░██──────██░░██████████──██████████░░██──────██░░██──────████░░████──██░░██████████──██████████░░██─\n",
"─────██░░██──────██░░░░░░░░░░██──██░░░░░░░░░░██──────██░░██──────██░░░░░░██──██░░░░░░░░░░██──██░░░░░░░░░░██─\n",
"─────██████──────██████████████──██████████████──────██████──────██████████──██████████████──██████████████─\n",
"────────────────────────────────────────────────────────────────────────────────────────────────────────────\n",
"\n",
"tarty9 : \n",
"\n",
"████████████████████████████████████████████████████████████████████████████████████████████████████████████\n",
"█░░░░░░░░░░░░░░██░░░░░░░░░░░░░░██░░░░░░░░░░░░░░██░░░░░░░░░░░░░░██░░░░░░░░████░░░░░░░░░░░░░░██░░░░░░░░░░░░░░█\n",
"█░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀░░████░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░█\n",
"█░░░░░░▄▀░░░░░░██░░▄▀░░░░░░░░░░██░░▄▀░░░░░░░░░░██░░░░░░▄▀░░░░░░██░░░░▄▀░░████░░░░░░░░░░▄▀░░██░░░░░░░░░░▄▀░░█\n",
"█████░░▄▀░░██████░░▄▀░░██████████░░▄▀░░██████████████░░▄▀░░████████░░▄▀░░████████████░░▄▀░░██████████░░▄▀░░█\n",
"█████░░▄▀░░██████░░▄▀░░░░░░░░░░██░░▄▀░░░░░░░░░░██████░░▄▀░░████████░░▄▀░░████░░░░░░░░░░▄▀░░██░░░░░░░░░░▄▀░░█\n",
"█████░░▄▀░░██████░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░██████░░▄▀░░████████░░▄▀░░████░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░█\n",
"█████░░▄▀░░██████░░▄▀░░░░░░░░░░██░░░░░░░░░░▄▀░░██████░░▄▀░░████████░░▄▀░░████░░▄▀░░░░░░░░░░██░░░░░░░░░░▄▀░░█\n",
"█████░░▄▀░░██████░░▄▀░░██████████████████░░▄▀░░██████░░▄▀░░████████░░▄▀░░████░░▄▀░░██████████████████░░▄▀░░█\n",
"█████░░▄▀░░██████░░▄▀░░░░░░░░░░██░░░░░░░░░░▄▀░░██████░░▄▀░░██████░░░░▄▀░░░░██░░▄▀░░░░░░░░░░██░░░░░░░░░░▄▀░░█\n",
"█████░░▄▀░░██████░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░██████░░▄▀░░██████░░▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░█\n",
"█████░░░░░░██████░░░░░░░░░░░░░░██░░░░░░░░░░░░░░██████░░░░░░██████░░░░░░░░░░██░░░░░░░░░░░░░░██░░░░░░░░░░░░░░█\n",
"████████████████████████████████████████████████████████████████████████████████████████████████████████████\n",
"\n",
"thin2 : \n",
"test123\n",
"\n",
Expand Down
6 changes: 3 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
⚠️ **PyPI** support of these versions will be removed in a **future release**

### Source code
- Download [Version 5.5](https://github.com/sepandhaghighi/art/archive/v5.5.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
- Download [Version 5.6](https://github.com/sepandhaghighi/art/archive/v5.6.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.5` or `pip3 install art==5.5` (Need root access)
- `pip install art==5.6` or `pip3 install art==5.6` (Need root access)

* Note : On `--upgrade` error install latest version of `setuptools` : `pip install setuptools` and retry

Expand All @@ -23,7 +23,7 @@

### Easy install

- Run `easy_install "art==5.5"` (Need root access)
- Run `easy_install "art==5.6"` (Need root access)

### MATLAB

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-620-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-627-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>
Expand Down Expand Up @@ -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">620</td>
<td align="center">627</td>
</tr>
<tr>
<td align="center">1-Line-Art Counter</td>
Expand Down
31 changes: 27 additions & 4 deletions art/art_param.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from .decor_dic import *
from .art_dic import *

ART_VERSION = "5.5" # pragma: no cover
ART_VERSION = "5.6" # pragma: no cover
FONT_SMALL_THRESHOLD = 50 # pragma: no cover
FONT_MEDIUM_THRESHOLD = 100 # pragma: no cover
FONT_LARGE_THRESHOLD = 200 # pragma: no cover
Expand Down Expand Up @@ -793,6 +793,9 @@
"fancy138",
"fancy139",
"fancy140",
"fancy141",
"fancy142",
"fancy143",
"foxy",
"white_square",
"black_square",
Expand Down Expand Up @@ -881,7 +884,11 @@
"tarty2",
"tarty3",
"tarty4",
"tarty5"]
"tarty5",
"tarty6",
"tarty7",
"tarty8",
"tarty9"]

RANDOM_FILTERED_FONTS = [
'5x8',
Expand All @@ -902,7 +909,16 @@
'moscow',
'dwhistled'] + NON_ASCII_FONTS

MIX_FILTERED_FONTS = ["tarty1", "tarty2", "tarty3", "tarty4", "tarty5"]
MIX_FILTERED_FONTS = [
"tarty1",
"tarty2",
"tarty3",
"tarty4",
"tarty5",
"tarty6",
"tarty7",
"tarty8",
"tarty9"]

DESCRIPTION = '''ASCII art is also known as "computer text art".
It involves the smart placement of typed special characters or
Expand Down Expand Up @@ -1472,11 +1488,18 @@
"fancy138": [fancy138_dic, False],
"fancy139": [fancy139_dic, False],
"fancy140": [fancy140_dic, False],
"fancy141": [fancy141_dic, False],
"fancy142": [fancy142_dic, False],
"fancy143": [fancy143_dic, False],
"tarty1": [tarty1_dic, False],
"tarty2": [tarty2_dic, False],
"tarty3": [tarty3_dic, False],
"tarty4": [tarty4_dic, False],
"tarty5": [tarty5_dic, False]
"tarty5": [tarty5_dic, False],
"tarty6": [tarty6_dic, False],
"tarty7": [tarty7_dic, False],
"tarty8": [tarty8_dic, False],
"tarty9": [tarty9_dic, False]
}

DECORATIONS_MAP = {"angry1": angry1, # pragma: no cover
Expand Down
10 changes: 5 additions & 5 deletions art/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4366,11 +4366,11 @@
\__,_||_| \__|
<BLANKLINE>
<BLANKLINE>
____ ____
__ __| ___| | ___|
\ \ / /|___ \ |___ \
\ V / ___) | _ ___) |
\_/ |____/ (_)|____/
____ __
__ __| ___| / /_
\ \ / /|___ \ | '_ \
\ V / ___) | _ | (_) |
\_/ |____/ (_) \___/
<BLANKLINE>
<BLANKLINE>
ASCII art is also known as "computer text art".
Expand Down
Loading

0 comments on commit c8f0332

Please sign in to comment.