Skip to content

Commit 8efbff2

Browse files
Merge pull request #27 from sepandhaghighi/dev
Version 2.7
2 parents b4790ab + 0919438 commit 8efbff2

File tree

13 files changed

+5123
-1529
lines changed

13 files changed

+5123
-1529
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,16 @@ matrix:
3838
- os: osx
3939
language: generic
4040
env: TOXENV=py27
41+
- os: osx
42+
language: generic
43+
env: TOXENV=py26
4144

4245
install:
4346
- pip install -r dev-requirements.txt
4447
- python setup.py install
4548

4649
script:
4750
- python -m art testcov
51+
- python -m cProfile -s cumtime art_profile.py
4852
after_success:
4953
- codecov

ArtList.ipynb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cell_type": "markdown",
1212
"metadata": {},
1313
"source": [
14-
"### Version : 2.6"
14+
"### Version : 2.7"
1515
]
1616
},
1717
{
@@ -78,18 +78,15 @@
7878
"9/11 truth\n",
7979
"✈__✈ █ █ ▄ \n",
8080
"******************************\n",
81-
"AK-47\n",
82-
"︻┳デ═— \n",
83-
"******************************\n",
84-
"I kill you\n",
85-
" ̿ ̿̿'̿̿\\̵͇̿̿\\=(•̪●)=/̵͇̿̿/'̿̿ ̿ ̿ \n",
86-
"******************************\n",
8781
"airplane1\n",
8882
" ‛¯¯٭٭¯¯(▫▫)¯¯٭٭¯¯’ \n",
8983
"******************************\n",
9084
"airplane2\n",
9185
"\n",
9286
"******************************\n",
87+
"ak-47\n",
88+
"︻┳デ═— \n",
89+
"******************************\n",
9390
"angry\n",
9491
" ლ(ಠ益ಠ)ლ \n",
9592
"******************************\n",
@@ -405,6 +402,9 @@
405402
"i dont care\n",
406403
"╭∩╮(︶︿︶)╭∩╮ \n",
407404
"******************************\n",
405+
"i kill you\n",
406+
" ̿ ̿̿'̿̿\\̵͇̿̿\\=(•̪●)=/̵͇̿̿/'̿̿ ̿ ̿ \n",
407+
"******************************\n",
408408
"inlove\n",
409409
"(✿ ♥‿♥) \n",
410410
"******************************\n",

CHANGELOG.md

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,47 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
## [2.7] - 2018-12-23
9+
### Added
10+
- 30 new fonts
11+
1. heroboti
12+
2. high_noo
13+
3. hills
14+
4. home_pak
15+
5. house_of
16+
6. hypa_bal
17+
7. hyper
18+
8. inc_raw
19+
9. italics
20+
10. kgames_i
21+
11. kik_star
22+
12. krak_out
23+
13. 4x4_offr
24+
14. 5x7
25+
15. 5x8
26+
16. 64f1
27+
17. 6x10
28+
18. 6x9
29+
19. a_zooloo
30+
20. asc
31+
21. assalt_m
32+
22. asslt_m
33+
23. atc
34+
24. atc_gran
35+
25. battle_s
36+
26. battlesh
37+
27. baz_bil
38+
28. beer_pub
39+
29. c1
40+
30. c2
41+
- `art_profile.py` added
42+
### Changed
43+
- docstring modified
44+
- `B1FF` font bug fixed
45+
- `ICL-1900` font bug fixed
46+
- `AK-47` 1-line art bug fixed
47+
- `I kill you` 1-line art bug fixed
48+
849
## [2.6] - 2018-12-05
950
### Added
1051
- 20 new fonts
@@ -604,7 +645,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
604645
- 1-Line art
605646
- CLI commands
606647

607-
[Unreleased]: https://github.com/sepandhaghighi/art/compare/v2.6...HEAD
648+
[Unreleased]: https://github.com/sepandhaghighi/art/compare/v2.7...HEAD
649+
[2.7]: https://github.com/sepandhaghighi/art/compare/v2.6...v2.7
608650
[2.6]: https://github.com/sepandhaghighi/art/compare/v2.5...v2.6
609651
[2.5]: https://github.com/sepandhaghighi/art/compare/v2.4...v2.5
610652
[2.4]: https://github.com/sepandhaghighi/art/compare/v2.3...v2.4

FontList.ipynb

Lines changed: 1763 additions & 1461 deletions
Large diffs are not rendered by default.

INSTALL.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
## Installation
22

33
### Source Code
4-
- Download [Version 2.6](https://github.com/sepandhaghighi/art/archive/v2.6.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
4+
- Download [Version 2.7](https://github.com/sepandhaghighi/art/archive/v2.7.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
55
- `python3 setup.py install` or `python setup.py install` (Need root access)
66

77
### PyPI
88

99

1010
- Check [Python Packaging User Guide](https://packaging.python.org/installing/)
11-
- `pip install art==2.6` or `pip3 install art==2.6` (Need root access)
11+
- `pip install art==2.7` or `pip3 install art==2.7` (Need root access)
1212

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

@@ -19,4 +19,4 @@
1919

2020
### Easy Install
2121

22-
- Run `easy_install "art==2.6"` (Need root access)
22+
- Run `easy_install "art==2.7"` (Need root access)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</a>
1313
<a href="https://badge.fury.io/py/art"><img src="https://badge.fury.io/py/art.svg" alt="PyPI version" height="18"></a>
1414
<a href="https://www.python.org/"><img src="https://img.shields.io/badge/built%20with-Python3-green.svg" alt="built with Python3" /></a>
15-
<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-270-blue.svg"></a>
15+
<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-300-blue.svg"></a>
1616
<a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-250-orange.svg"></a>
1717
<a href="https://t.me/artlib_bot" target="__blank"><img src="https://img.shields.io/badge/Telegram-Bot-red.svg"></a>
1818
<a href="https://anaconda.org/sepandhaghighi/art"><img src="https://anaconda.org/sepandhaghighi/art/badges/version.svg"></a>
@@ -61,7 +61,7 @@ Art is a Python lib for text converting to ASCII ART fancy. ;-)
6161
</tr>
6262
<tr>
6363
<td align="center">Font Counter</td>
64-
<td align="center">270</td>
64+
<td align="center">300</td>
6565
</tr>
6666
<tr>
6767
<td align="center">1-Line-Art Counter</td>

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ build: false
22

33
environment:
44
matrix:
5-
65
- PYTHON: "C:\\Python27"
76
PYTHON_VERSION: "2.7.2"
87
PYTHON_ARCH: "32"
@@ -58,4 +57,5 @@ install:
5857
- "%PYTHON%/python.exe setup.py install"
5958

6059
test_script:
61-
- "%PYTHON%/python.exe -m art testcov"
60+
- "%PYTHON%/python.exe -m art testcov"
61+
- "%PYTHON%/python.exe -m cProfile -s cumtime art_profile.py"

art/art.py

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import sys
66
import random
77

8-
version = "2.6"
8+
version = "2.7"
99

1010

1111
description = '''ASCII art is also known as "computer text art".
@@ -140,7 +140,7 @@ class artError(Exception):
140140
"henry3d": [henry3d_dic, False],
141141
"horizontalleft": [horizontalleft_dic, True],
142142
"horizontalright": [horizontalright_dic, True],
143-
"ICL-1900": [ICL_1900_dic, True],
143+
"icl-1900": [ICL_1900_dic, True],
144144
"impossible": [impossible_dic, True],
145145
"jacky": [jacky_dic, True],
146146
"katakana": [katakana_dic, False],
@@ -194,7 +194,7 @@ class artError(Exception):
194194
"alpha": [alpha_dic, True],
195195
"amc3liv1": [amc3liv1_dic, True],
196196
"ascii_new_roman": [ascii_new_roman_dic, True],
197-
"B1FF": [B1FF_dic, True],
197+
"b1ff": [B1FF_dic, True],
198198
"dwhistled": [dwhistled_dic, False],
199199
"eftiwall": [eftiwall_dic, False],
200200
"fire_font-k": [fire_font_k_dic, False],
@@ -234,7 +234,37 @@ class artError(Exception):
234234
"xsansbi": [xsansbi_dic, False],
235235
"xsansi": [xsansi_dic, False],
236236
"xtimes": [xtimes_dic, False],
237-
"xttyb": [xttyb_dic, False]
237+
"xttyb": [xttyb_dic, False],
238+
"heroboti": [heroboti_dic, False],
239+
"high_noo": [high_noo_dic, False],
240+
"hills": [hills_dic, False],
241+
"home_pak": [home_pak_dic, False],
242+
"house_of": [house_of_dic, False],
243+
"hypa_bal": [hypa_bal_dic, False],
244+
"hyper": [hyper_dic, False],
245+
"inc_raw": [inc_raw_dic, False],
246+
"italics": [italics_dic, False],
247+
"kgames_i": [kgames_i_dic, False],
248+
"4x4_offr": [dic_4x4_offr, False],
249+
"5x7": [dic_5x7, False],
250+
"5x8": [dic_5x8, False],
251+
"6x9": [dic_6x9, False],
252+
"6x10": [dic_6x10, False],
253+
"64f1": [dic_64f1, False],
254+
"a_zooloo": [a_zooloo_dic, False],
255+
"asc": [asc_dic, False],
256+
"assalt_m": [assalt_m_dic, False],
257+
"asslt_m": [asslt__m_dic, False],
258+
"atc": [atc_dic, False],
259+
"atc_gran": [atc_gran_dic, False],
260+
"battle_s": [battle_s_dic, False],
261+
"battlesh": [battlesh_dic, False],
262+
"baz_bil": [baz_bil_dic, False],
263+
"beer_pub": [beer_pub_dic, False],
264+
"c1": [c1_dic, False],
265+
"c2": [c2_dic, False],
266+
"kik_star": [kik_star_dic, False],
267+
"krak_out": [krak_out_dic, False]
238268
}
239269
font_counter = len(font_map)
240270
DEFAULT_FONT = "standard"
@@ -243,32 +273,32 @@ class artError(Exception):
243273
def line(char="*", number=30):
244274
'''
245275
This function print line of chars
246-
:param char: character
276+
:param char: input character
247277
:type char:str
248-
:param number: number of character
278+
:param number: number of characters
249279
:return: None
250280
'''
251281
print(char * number)
252282

253283

254284
def font_list(text="test"):
255285
'''
256-
:param text : Input text
286+
This function print all Of fonts
287+
:param text : input text
257288
:type text : str
258-
This Function Print All Of Fonts
259289
:return: None
260290
'''
261291
for item in sorted(list(font_map.keys())):
262292
print(str(item) + " : ")
263-
if str(item) in ["char4"]:
293+
if str(item) in ["char4", "c2"]:
264294
tprint(text.upper(), str(item))
265295
else:
266296
tprint(text, str(item))
267297

268298

269299
def art_list():
270300
'''
271-
This Function Print All Of 1Line Arts
301+
This function print all Of 1-Line arts
272302
:return: None
273303
'''
274304
for i in sorted(list(art_dic.keys())):
@@ -283,7 +313,7 @@ def art_list():
283313

284314
def help_func():
285315
'''
286-
Print Help Page
316+
Print help page
287317
:return: None
288318
'''
289319
tprint("art")
@@ -302,7 +332,7 @@ def help_func():
302332

303333
def aprint(artname, number=1, text=""):
304334
'''
305-
Art Print
335+
Art print
306336
This function print ascii art
307337
:param artname: artname
308338
:type artname : str
@@ -346,7 +376,7 @@ def art(artname, number=1, text=""):
346376

347377
def randart():
348378
'''
349-
This function return random 1line art
379+
This function return random 1-line art
350380
:return: ascii art as str
351381
'''
352382
return art("random")
@@ -380,7 +410,7 @@ def tsave(
380410
chr_ignore=True,
381411
print_status=True):
382412
'''
383-
413+
This function save ascii art
384414
:param text: input text
385415
:param font: input font
386416
:type font:str
@@ -389,7 +419,7 @@ def tsave(
389419
:type filename:str
390420
:param chr_ignore: ignore not supported character
391421
:type chr_ignore:bool
392-
:param print_status : Save message print flag
422+
:param print_status : save message print flag
393423
:type print_status:bool
394424
:return: None
395425
'''
@@ -462,7 +492,7 @@ def text2art(text, font=DEFAULT_FONT, chr_ignore=True):
462492
:type font:str
463493
:param chr_ignore: ignore not supported character
464494
:type chr_ignore:bool
465-
:return: artText as str
495+
:return: ascii art text as str
466496
'''
467497
split_list = []
468498
result_list = []
@@ -515,14 +545,14 @@ def text2art(text, font=DEFAULT_FONT, chr_ignore=True):
515545
def set_default(font=DEFAULT_FONT, chr_ignore=True, filename="art",
516546
print_status=True):
517547
'''
518-
This fuction change text2art tprint and tsave default values
548+
This function change text2art, tprint and tsave default values
519549
:param font: input font
520550
:type font:str
521551
:param chr_ignore: ignore not supported character
522552
:type chr_ignore:bool
523553
:param filename: output file name (only tsave)
524554
:type filename:str
525-
:param print_status : Save message print flag (only tsave)
555+
:param print_status : save message print flag (only tsave)
526556
:type print_status:bool
527557
:return: None
528558
'''

art/art_dic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
"love2": " ~♡ⓛⓞⓥⓔ♡~",
189189
"dancee": "♪┏(°.°)┛┗(°.°)┓┗(°.°)┛┏(°.°)┓ ♪",
190190
"mtmtika": ":o + :p = 69",
191-
"AK-47": "︻┳デ═—",
191+
"ak-47": "︻┳デ═—",
192192
"eaten apple": "[===]-'",
193193
"huhu": "█▬█ █▄█ █▬█ █▄█",
194194
"faydre": "(U) [^_^] (U) ",
@@ -211,7 +211,7 @@
211211
"melp2": "(<(<>(<>.(<>..<>).<>)<>)>)",
212212
"happy square": "【ツ】",
213213
"snowman": "☃",
214-
"I kill you": " ̿ ̿̿'̿̿\̵͇̿̿\=(•̪●)=/̵͇̿̿/'̿̿ ̿ ̿",
214+
"i kill you": " ̿ ̿̿'̿̿\̵͇̿̿\=(•̪●)=/̵͇̿̿/'̿̿ ̿ ̿",
215215
"happy3": "㋡",
216216
"jaymz": " (•̪●)==ε/̵͇̿​̿/’̿’̿ ̿ ̿̿ `(•.°)~",
217217
"text decoration": ["(¯`·._.··¸.-~*´¨¯¨`*·~-.,-(_", "_)-,"

0 commit comments

Comments
 (0)