Skip to content

Commit

Permalink
Merge pull request #81 from sepandhaghighi/dev
Browse files Browse the repository at this point in the history
Version 4.3
  • Loading branch information
sepandhaghighi authored Dec 5, 2019
2 parents cd3aeba + dc84bb6 commit 06ab4b2
Show file tree
Hide file tree
Showing 13 changed files with 1,421 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .travis/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $PYTHON_COMMAND -m art testcov2

if [ "$IS_IN_TRAVIS" = 'false' ] || [ "$TRAVIS_PYTHON_VERSION" = '3.6' ]
then
$PYTHON_COMMAND -m vulture art/ otherfile/ setup.py art_profile.py --min-confidence 65 --exclude=build,.eggs --sort-by-size
$PYTHON_COMMAND -m vulture art/ otherfile/ setup.py art_profile.py --min-confidence 65 --exclude=__init__.py --sort-by-size
$PYTHON_COMMAND -m bandit -r art -s B311
$PYTHON_COMMAND -m pydocstyle --match='(?!test).*\.py'
codecov
Expand Down
127 changes: 116 additions & 11 deletions ArtList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 4.2"
"### Version : 4.3"
]
},
{
Expand All @@ -38,7 +38,7 @@
{
"data": {
"text/plain": [
"370"
"405"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -99,9 +99,21 @@
"almost cared\n",
"╰╏ ◉ 〜 ◉ ╏╯ \n",
"******************************\n",
"american money\n",
"american money1\n",
"[($)] \n",
"******************************\n",
"american money2\n",
"[̲̅$̲̅(̲̅1̲̅)̲̅$̲̅] \n",
"******************************\n",
"american money3\n",
"[̲̅$̲̅(̲̅5̲̅)̲̅$̲̅] \n",
"******************************\n",
"american money4\n",
"[̲̅$̲̅(̲̅ιοο̲̅)̲̅$̲̅] \n",
"******************************\n",
"american money5\n",
"[̲̅$̲̅(̲̅2οο̲̅)̲̅$̲̅] \n",
"******************************\n",
"angel\n",
"^i^ \n",
"******************************\n",
Expand Down Expand Up @@ -138,12 +150,21 @@
"bagel\n",
"nln >_< nln \n",
"******************************\n",
"band aid\n",
"(̲̅:̲̅:̲̅:̲̅[̲̅ ̲̅]̲̅:̲̅:̲̅:̲̅ ) \n",
"******************************\n",
"barbell\n",
"▐━━━━━▌ \n",
"******************************\n",
"bat\n",
"barcode\n",
"█║▌│ █│║▌ ║││█║▌ │║║█║ │║║█║ \n",
"******************************\n",
"bat1\n",
"^O^ \n",
"******************************\n",
"bat2\n",
" ^v^ \n",
"******************************\n",
"bautista\n",
"(╯°_°)╯︵ ━━━ \n",
"******************************\n",
Expand Down Expand Up @@ -219,9 +240,12 @@
"care crowd\n",
"(-(-_(-_-)_-)-) \n",
"******************************\n",
"cassette\n",
"cassette1\n",
"|[●▪▪●]| \n",
"******************************\n",
"cassette2\n",
"[¯ↂ■■ↂ¯] \n",
"******************************\n",
"cat face\n",
"⦿⽘⦿ \n",
"******************************\n",
Expand All @@ -234,6 +258,9 @@
"cat2\n",
"龴ↀ◡ↀ龴 \n",
"******************************\n",
"cat3\n",
"^.--.^ \n",
"******************************\n",
"caterpillar\n",
",/\\,/\\,/\\,/\\,/\\,/\\,o \n",
"******************************\n",
Expand Down Expand Up @@ -288,6 +315,12 @@
"cthulhu\n",
"^(;,;)^ \n",
"******************************\n",
"cup1\n",
"(▓ \n",
"******************************\n",
"cup2\n",
"\\̅_̅/̷̚ʾ \n",
"******************************\n",
"cute cat\n",
"^⨀ᴥ⨀^ \n",
"******************************\n",
Expand Down Expand Up @@ -375,6 +408,18 @@
"eeriemob\n",
"(-(-_-(-_(-_(-_-)_-)-_-)_-)_-)-) \n",
"******************************\n",
"electrocardiogram1\n",
"√v^√v^√v^√v^√♥ \n",
"******************************\n",
"electrocardiogram2\n",
"v^v^v^v^√\\/♥ \n",
"******************************\n",
"electrocardiogram3\n",
"/\\/\\/\\/\\/\\/\\/\\/\\/\\/\\/\\v^♥ \n",
"******************************\n",
"electrocardiogram4\n",
"√v^√v^♥√v^√v^√ \n",
"******************************\n",
"elephant\n",
"°j°m \n",
"******************************\n",
Expand Down Expand Up @@ -444,6 +489,15 @@
"fish2\n",
"><> \n",
"******************************\n",
"fish3\n",
"`·.¸¸ ><((((º>.·´¯`·><((((º> \n",
"******************************\n",
"fish4\n",
"><> ><> \n",
"******************************\n",
"fish5\n",
"<>< \n",
"******************************\n",
"flex\n",
"ᕙ(⇀‸↼‶)ᕗ \n",
"******************************\n",
Expand Down Expand Up @@ -498,9 +552,15 @@
"guitar\n",
"c====(=#O| ) ~~ ♬·¯·♩¸¸♪·¯·♫¸ \n",
"******************************\n",
"gun\n",
"gun1\n",
"︻╦╤─ \n",
"******************************\n",
"gun2\n",
"︻デ═一 \n",
"******************************\n",
"gun3\n",
"╦̵̵̿╤─ ҉ ~ • \n",
"******************************\n",
"hacksaw\n",
"[|^^^^^^^ \n",
"******************************\n",
Expand Down Expand Up @@ -633,9 +693,12 @@
"kitty\n",
"=^..^= \n",
"******************************\n",
"knife\n",
"knife1\n",
")xxxxx[;;;;;;;;;> \n",
"******************************\n",
"knife2\n",
")xxx[::::::::::> \n",
"******************************\n",
"koala\n",
"@( * O * )@ \n",
"******************************\n",
Expand All @@ -660,9 +723,24 @@
"linqan\n",
":Q___ \n",
"******************************\n",
"loading\n",
"loading1\n",
"█▒▒▒▒▒▒▒▒▒ \n",
"******************************\n",
"loading2\n",
"███▒▒▒▒▒▒▒ \n",
"******************************\n",
"loading3\n",
"█████▒▒▒▒▒ \n",
"******************************\n",
"loading4\n",
"███████▒▒▒ \n",
"******************************\n",
"loading5\n",
"█████████▒ \n",
"******************************\n",
"loading6\n",
"██████████ \n",
"******************************\n",
"long rose\n",
"---------------------{{---<((@) \n",
"******************************\n",
Expand Down Expand Up @@ -744,9 +822,15 @@
"monster2\n",
"٩(- ̮̮̃-̃)۶ \n",
"******************************\n",
"mouse\n",
"mouse1\n",
"----{,_,\"> \n",
"******************************\n",
"mouse2\n",
" . ~~(__^·> \n",
"******************************\n",
"mouse3\n",
"<·^__)~~ . \n",
"******************************\n",
"mtmtika\n",
":o + :p = 69 \n",
"******************************\n",
Expand All @@ -759,7 +843,10 @@
"nathan\n",
"♪└( ̄◇ ̄)┐♪└( ̄◇ ̄)┐♪└( ̄◇ ̄)┐♪ \n",
"******************************\n",
"needle\n",
"needle1\n",
"┣▇▇▇═─ \n",
"******************************\n",
"needle2\n",
"|==|iiii|>----- \n",
"******************************\n",
"neo\n",
Expand Down Expand Up @@ -900,6 +987,9 @@
"rose3\n",
"@-->--->--- \n",
"******************************\n",
"rose4\n",
"@}~}~~~ \n",
"******************************\n",
"round bird\n",
",(u°)> \n",
"******************************\n",
Expand Down Expand Up @@ -972,9 +1062,12 @@
"smug bastard\n",
"(‾⌣‾) \n",
"******************************\n",
"snail\n",
"snail1\n",
"'-'_@_ \n",
"******************************\n",
"snail2\n",
"'\\Q___ \n",
"******************************\n",
"sniper rifle\n",
"︻デ┳═ー \n",
"******************************\n",
Expand Down Expand Up @@ -1062,6 +1155,18 @@
"sword5\n",
"<%%%%|==========> \n",
"******************************\n",
"sword6\n",
"o()xxxx[{::::::::::::::::::::::::::::::::::> \n",
"******************************\n",
"sword7\n",
"o==[]::::::::::::::::> \n",
"******************************\n",
"sword8\n",
"▬▬ι═══════> \n",
"******************************\n",
"sword9\n",
" <═══════ι▬▬ \n",
"******************************\n",
"table flip\n",
"(╯°□°)╯︵ ┻━┻ \n",
"******************************\n",
Expand Down
63 changes: 62 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,66 @@ 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]
## [4.3] - 2019-12-05
### Added
- 35 new 1-line art
1. cup1
2. cup2
3. gun2
4. gun3
5. fish3
6. fish4
7. fish5
8. sword6
9. sword7
10. sword8
11. sword9
12. knife2
13. barcode
14. loading1
15. loading3
16. loading4
17. loading5
18. loading6
19. bat2
20. band aid
21. mouse2
22. mouse3
23. cat3
24. needle2
25. rose4
26. electrocardiogram1
27. electrocardiogram2
28. electrocardiogram3
29. electrocardiogram4
30. snail2
31. american money2
32. american money3
33. american money4
34. american money5
35. cassette2
- 10 new fonts
1. sarah
2. hippie
3. minion
4. greek_legends
5. funky_fresh
6. atlantic
7. foreign_friends
8. native_lands
9. sunday_cuddle
10. chinese_mafia
### Changed
- `gun` 1-line art renamed to `gun1`
- `knife` 1-line art renamed to `knife1`
- `loading` 1-line art renamed to `loading2`
- `bat` 1-line art renamed to `bat1`
- `mouse` 1-line art renamed to `mouse1`
- `needle` 1-line art renamed to `needle2`
- `snail` 1-line art renamed to `snail1`
- `american money` 1-line art renamed to `american money1`
- `cassette` 1-line art renamed to `cassette1`
- Test system modified
## [4.2] - 2019-10-30
### Added
- 14 new fonts
Expand Down Expand Up @@ -1117,7 +1177,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/v4.2...dev
[Unreleased]: https://github.com/sepandhaghighi/art/compare/v4.3...dev
[4.3]: https://github.com/sepandhaghighi/art/compare/v4.2...v4.3
[4.2]: https://github.com/sepandhaghighi/art/compare/v4.1...v4.2
[4.1]: https://github.com/sepandhaghighi/art/compare/v4.0...v4.1
[4.0]: https://github.com/sepandhaghighi/art/compare/v3.9...v4.0
Expand Down
Loading

0 comments on commit 06ab4b2

Please sign in to comment.