Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Messletters2 #109

Merged
merged 34 commits into from
Feb 6, 2020
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ad13762
font : scammer font added #101
sepandhaghighi Feb 4, 2020
a930470
font : strikethrough font added #101
sepandhaghighi Feb 4, 2020
8424ef5
font : drako font added #101
sepandhaghighi Feb 4, 2020
ded84c2
font : celtic font added #101
sepandhaghighi Feb 4, 2020
01aded9
font : fasion font added #101
sepandhaghighi Feb 4, 2020
6f7a743
font : curly font added #101
sepandhaghighi Feb 4, 2020
1015749
font : russian font added #101
sepandhaghighi Feb 4, 2020
3db23b1
font : messletters font added #101
sepandhaghighi Feb 4, 2020
1d5a353
font : coptic1 font added #101
sepandhaghighi Feb 4, 2020
83d2de7
font : swirly font added #101
sepandhaghighi Feb 4, 2020
f5e7941
font : dotted font added #101
sepandhaghighi Feb 4, 2020
9a75852
font : coptic2 font added #101
sepandhaghighi Feb 4, 2020
1a9a84c
font : parenthesized font added #101
sepandhaghighi Feb 4, 2020
5de10bc
font : strange font added #101
sepandhaghighi Feb 4, 2020
961e65c
font : fancy108 font added #101
sepandhaghighi Feb 4, 2020
521fa91
font : wiggly font added #101
sepandhaghighi Feb 4, 2020
3b5c6fc
font : hazy font added #101
sepandhaghighi Feb 4, 2020
ef9663e
font : hyves font added #101
sepandhaghighi Feb 4, 2020
8955eac
font : awcute font added #101
sepandhaghighi Feb 4, 2020
081d2b4
font : slammer font added #101
sepandhaghighi Feb 4, 2020
b38ecb5
fix : tests updated #101
sepandhaghighi Feb 4, 2020
b9a734f
doc : font counters updated #101
sepandhaghighi Feb 4, 2020
a38a273
doc : CHANGELOG updated #101
sepandhaghighi Feb 4, 2020
c8927f5
fix : autopep8 fix #101
sepandhaghighi Feb 4, 2020
00be2a9
fix : coverage moved to extras_require
sepandhaghighi Feb 4, 2020
e5420e5
fix : minor bug in travis config fixed
sepandhaghighi Feb 4, 2020
98aefd6
fix : minor edit in __main__.py
sepandhaghighi Feb 4, 2020
9b28c52
del : requirements.txt removed
sepandhaghighi Feb 4, 2020
36ac0c5
fix : minor edit in appveyor config file
sepandhaghighi Feb 4, 2020
550503d
fix : minor edit in install.sh
sepandhaghighi Feb 4, 2020
f61e88d
fix : minor edit in test.sh
sepandhaghighi Feb 4, 2020
ad0b073
doc : CHANGELOG updated
sepandhaghighi Feb 4, 2020
83897f7
fix : minor edit in test.sh
sepandhaghighi Feb 4, 2020
5dbf31e
fix : minor edit in test.sh
sepandhaghighi Feb 4, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ then
PYTHON_COMMAND=python3
PIP_COMMAND=pip3
fi

$PIP_COMMAND install -r requirements.txt

$PYTHON_COMMAND setup.py install
$PYTHON_COMMAND -m art test
$PYTHON_COMMAND -m art test2
$PYTHON_COMMAND -m art testcov
$PYTHON_COMMAND -m art testcov2

if [ "$TRAVIS_OS_NAME" == "osx" ]
then
Expand Down
6 changes: 5 additions & 1 deletion .travis/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ set -x

IS_IN_TRAVIS=false
PYTHON_COMMAND=python
PIP_COMMAND=pip

if [ "$TRAVIS_OS_NAME" == "osx" ]
then
PYTHON_COMMAND=python3
PIP_COMMAND=pip3
fi

if [ "$CI" = 'true' ] && [ "$TRAVIS" = 'true' ]
Expand All @@ -29,4 +31,6 @@ then
fi


$PYTHON_COMMAND -m cProfile -s cumtime art_profile.py
$PYTHON_COMMAND -m cProfile -s cumtime art_profile.py
$PIP_COMMAND uninstall art
$PIP_COMMAND install art --upgrade
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new line missed.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope i might make mistake

22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@ 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]
### Added
- 20 new fonts
1. scammer
2. strikethrough
3. drako
4. celtic
5. fasion
6. curly
7. russian
8. messletters
9. swirly
10. dotted
11. parenthesized
12. strange
13. wiggly
14. hazy
15. hyves
16. awcute
17. slammer
18. coptic1
19. coptic2
20. fancy108
## [4.5] - 2020-01-29
### Added
- 35 new fonts
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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-540-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-560-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-516-orange.svg"></a>
<a href="https://t.me/artlib_bot" target="__blank"><img src="https://img.shields.io/badge/Telegram-Bot-red.svg"></a>
<a href="https://anaconda.org/sepandhaghighi/art"><img src="https://anaconda.org/sepandhaghighi/art/badges/version.svg"></a>
Expand Down Expand Up @@ -66,7 +66,7 @@ ART is a Python lib for text converting to ASCII art fancy. ;-)
</tr>
<tr>
<td align="center">Font Counter</td>
<td align="center">540</td>
<td align="center">560</td>
</tr>
<tr>
<td align="center">1-Line-Art Counter</td>
Expand Down
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@ init:
- "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"

install:
- "%PYTHON%/Scripts/pip.exe install -r requirements.txt"
- "%PYTHON%/python.exe setup.py install"

test_script:
- "%PYTHON%/python.exe -m art testcov"
- "%PYTHON%/python.exe -m art test"
- "%PYTHON%/python.exe otherfile/version_check.py"
- "%PYTHON%/python.exe -m cProfile -s cumtime art_profile.py"
12 changes: 8 additions & 4 deletions art/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
import doctest
import os
import zipfile
COVERAGE_INSTALL = True
try:
import coverage
except ImportError:
print(PACKAGE_LOAD_WARNING)
COVERAGE_INSTALL = False


def select_test(test_name="TEST"):
Expand All @@ -22,8 +23,11 @@ def select_test(test_name="TEST"):
"""
error_flag_2 = 0
if test_name == "TESTCOV" or test_name == "TESTCOV2":
cov = coverage.Coverage()
cov.start()
if COVERAGE_INSTALL:
cov = coverage.Coverage()
cov.start()
else:
print(PACKAGE_LOAD_WARNING)
error_flag_1 = doctest.testfile(
"test.py",
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
Expand All @@ -35,7 +39,7 @@ def select_test(test_name="TEST"):
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS | doctest.IGNORE_EXCEPTION_DETAIL,
verbose=False)[0]
error_flag = error_flag_1 + error_flag_2
if test_name == "TESTCOV" or test_name == "TESTCOV2":
if (test_name == "TESTCOV" or test_name == "TESTCOV2") and COVERAGE_INSTALL:
cov.stop()
cov.report()
cov.save()
Expand Down
44 changes: 42 additions & 2 deletions art/art_param.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@
"fancy105",
"fancy106",
"fancy107",
"fancy108",
"white_square",
"black_square",
"paranormal",
Expand Down Expand Up @@ -319,7 +320,26 @@
"cute3",
"malayalam",
"cranky",
"lopioo"]
"lopioo",
"scammer",
"strikethrough",
"drako",
"celtic",
"fasion",
"curly",
"russian",
"messletters",
"coptic1",
"swirly",
"dotted",
"coptic2",
"parenthesized",
"strange",
"wiggly",
"hazy",
"hyves",
"awcute",
"slammer"]

RANDOM_FILTERED_FONTS = [
'5x8',
Expand Down Expand Up @@ -832,7 +852,27 @@
"fancy106": [fancy106_dic, False],
"fancy107": [fancy107_dic, False],
"cranky": [cranky_dic, False],
"lopioo": [lopioo_dic, False]
"lopioo": [lopioo_dic, False],
"scammer": [scammer_dic, False],
"strikethrough": [strikethrough_dic, False],
"drako": [drako_dic, False],
"celtic": [celtic_dic, False],
"fasion": [fasion_dic, False],
"curly": [curly_dic, False],
"russian": [russian_dic, False],
"messletters": [messletters_dic, False],
"coptic1": [coptic1_dic, False],
"swirly": [swirly_dic, False],
"dotted": [dotted_dic, False],
"coptic2": [coptic2_dic, False],
"parenthesized": [parenthesized_dic, False],
"strange": [strange_dic, False],
"fancy108": [fancy108_dic, False],
"wiggly": [wiggly_dic, False],
"hazy": [hazy_dic, False],
"hyves": [hyves_dic, False],
"awcute": [awcute_dic, False],
"slammer": [slammer_dic, False]
}

FONT_NAMES = sorted(list(FONT_MAP.keys())) # pragma: no cover
Expand Down
60 changes: 60 additions & 0 deletions art/test2.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
atlantic:
ϯεςϯ
<BLANKLINE>
awcute:
téśt
<BLANKLINE>
awesome:
тεƨт
<BLANKLINE>
Expand All @@ -34,6 +37,9 @@
carrier2:
TᙓST
<BLANKLINE>
celtic:
էεʂէ
<BLANKLINE>
chinese_mafia:
丁乇丂丁
<BLANKLINE>
Expand All @@ -52,9 +58,18 @@
contouring4:
(̲̅t)(̲̅e)(̲̅s)(̲̅t)
<BLANKLINE>
coptic1:
ⲧⲉ⳽ⲧ
<BLANKLINE>
coptic2:
ⲧⲉ⳽ⲧ
<BLANKLINE>
cranky:
†εš†
<BLANKLINE>
curly:
էҽʂէ
<BLANKLINE>
currency:
₮Ɇ₴₮
<BLANKLINE>
Expand All @@ -73,6 +88,12 @@
dirty2:
ẗệṩẗ
<BLANKLINE>
dotted:
ẗëṡẗ
<BLANKLINE>
drako:
ϮꂅᏕϮ
<BLANKLINE>
dwarf:
ᵗᵉˢᵗ
<BLANKLINE>
Expand Down Expand Up @@ -106,6 +127,9 @@
fancy107:
τεsτ
<BLANKLINE>
fancy108:
ƚЄ$ƚ
<BLANKLINE>
fancy11:
ՇєรՇ
<BLANKLINE>
Expand Down Expand Up @@ -397,6 +421,9 @@
fancy99:
тeѕт
<BLANKLINE>
fasion:
ŧεşŧ
<BLANKLINE>
flip:
ϝԍƨϝ
<BLANKLINE>
Expand Down Expand Up @@ -424,9 +451,15 @@
handwriting2:
ƚҽʂƚ
<BLANKLINE>
hazy:
ŤƐらŤ
<BLANKLINE>
hippie:
⊥ε﹩⊥
<BLANKLINE>
hyves:
t€$t
<BLANKLINE>
knight:
ṮḕṠṮ
<BLANKLINE>
Expand All @@ -448,6 +481,9 @@
malayalam:
੮૯ട੮
<BLANKLINE>
messletters:
ᴛєѕᴛ
<BLANKLINE>
minion:
ᴛᴇsᴛ
<BLANKLINE>
Expand All @@ -466,12 +502,24 @@
paranormal:
tєst
<BLANKLINE>
parenthesized:
⒯⒠⒮⒯
<BLANKLINE>
rusify:
тё$т
<BLANKLINE>
russian:
TΞST
<BLANKLINE>
sarah:
ᏆℰЅᏆ
<BLANKLINE>
scammer:
těst
<BLANKLINE>
slammer:
ƮęsƮ
<BLANKLINE>
smallcaps2:
ᴛᴇsᴛ
<BLANKLINE>
Expand All @@ -487,6 +535,12 @@
special:
TEᔕT
<BLANKLINE>
strange:
τεȘτ
<BLANKLINE>
strikethrough:
ŧɇsŧ
<BLANKLINE>
subscript:
ₜₑₛₜ
<BLANKLINE>
Expand All @@ -496,6 +550,9 @@
superscript:
ᵗᵉˢᵗ
<BLANKLINE>
swirly:
੮૯ς੮
<BLANKLINE>
symbols:
☂€ⓢ☂
<BLANKLINE>
Expand All @@ -520,6 +577,9 @@
white_square:
🅃🄴🅂🅃
<BLANKLINE>
wiggly:
⊥ÈS⊥
<BLANKLINE>
>>> random.seed(24)
>>> Art = text2art("test","rnd-na")
>>> random.seed(45)
Expand Down
Loading