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

Version 4.6 #116

Merged
merged 134 commits into from
Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
998d9ca
add : decoration added to text2art
sadrasabouri Nov 2, 2019
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
fb79b93
Merge pull request #109 from sepandhaghighi/messletters2
sadrasabouri Feb 6, 2020
0def16c
fix : NON_ASCII_ARTS list added #106
sepandhaghighi Feb 7, 2020
3f2b1d9
fix : NON_ASCII_ARTS added to __init__ #106
sepandhaghighi Feb 7, 2020
f2475bf
fix : autopep8 fix #106
sepandhaghighi Feb 7, 2020
f2177ab
fix : art_list function modified #106
sepandhaghighi Feb 7, 2020
a3c7024
fix : tests updated #106
sepandhaghighi Feb 7, 2020
c28648b
fix : tests updated #106
sepandhaghighi Feb 7, 2020
0c35e98
doc : CONTRIBUTING.md updated #106
sepandhaghighi Feb 7, 2020
7d63f5d
fix : font_list function modified #106
sepandhaghighi Feb 8, 2020
2acea82
fix : art_list function modified #106
sepandhaghighi Feb 8, 2020
b9a5b87
doc : CHANGELOG updated #106
sepandhaghighi Feb 8, 2020
bea4123
doc : README updated #106
sepandhaghighi Feb 8, 2020
4bcd481
fix : art_profile.py updated #106
sepandhaghighi Feb 8, 2020
addbec4
doc : minor edit in CONTRIBUTING.md #106
sepandhaghighi Feb 8, 2020
bc53d15
Merge pull request #110 from sepandhaghighi/Non-ASCII-Art
sadrasabouri Feb 13, 2020
7c9557c
Merge remote-tracking branch 'upstream/dev' into dev
sadrasabouri Feb 13, 2020
b957263
add : decor_dic.py file added.
sadrasabouri Feb 13, 2020
7f0ebbe
add : description added to decor_dic.
sadrasabouri Feb 13, 2020
f759ab2
add : new decorations added to decor_dic.py
sadrasabouri Feb 13, 2020
4068c9d
add : decor_dic imported to art_param and DECORATIONS_MAP added to.
sadrasabouri Feb 13, 2020
9b4b806
fix : autopep8ed.
sadrasabouri Feb 13, 2020
7c048a4
delete : previous suloton deleted.
sadrasabouri Feb 13, 2020
56856e4
add : indirect_decorationmethod added.
sadrasabouri Feb 13, 2020
43d8785
add : decoration option added to text2art.
sadrasabouri Feb 13, 2020
21f822b
add : decoration flag added to tsave.
sadrasabouri Feb 13, 2020
b1ad4dd
add : decoration flag added to tprint.
sadrasabouri Feb 13, 2020
1335ab2
log : changes logged due to #75.
sadrasabouri Feb 13, 2020
62db26e
fix : minor bug fixed.
sadrasabouri Feb 13, 2020
81c2055
add : tests added.
sadrasabouri Feb 13, 2020
4be7c82
log : new changes logged
sadrasabouri Feb 13, 2020
803e60f
pep8 : autopep8ed.
sadrasabouri Feb 13, 2020
567df21
fix : bad autopep8 results fixed.
sadrasabouri Feb 14, 2020
2d83c71
fix : tsave, tprint and text2art default value setting fixed.
sadrasabouri Feb 23, 2020
03a7099
change : change decoration from string to list of string
sadrasabouri Feb 23, 2020
9e4dc4f
add : decor function added.
sadrasabouri Feb 23, 2020
b056fe0
add : minor use of decor fucntion added.
sadrasabouri Feb 23, 2020
76ccb51
log : changes logged.
sadrasabouri Feb 23, 2020
8c20304
fix : minor changes in barcode decoration fixed.
sadrasabouri Feb 23, 2020
5240340
edit : minor edits.
sadrasabouri Feb 23, 2020
badb66d
fix : minor bugs at text2art fixed.
sadrasabouri Feb 23, 2020
04996ed
add : DECORATION_TYPE_ERROR added.
sadrasabouri Feb 23, 2020
eadb462
fix : bug fixed at set_default.
sadrasabouri Feb 23, 2020
c238ea1
barcode decor fixed.
sadrasabouri Feb 23, 2020
a7ac088
fix : sort decoration in alphabetic order.
sadrasabouri Feb 26, 2020
f63a730
change : decoration argument's place changed.
sadrasabouri Feb 26, 2020
31e63af
add : indirect decoration call tests added.
sadrasabouri Feb 26, 2020
df76bcc
test : tsave function test tranfered to test2
sadrasabouri Feb 26, 2020
c028d73
add : 7 new decorations added.
sadrasabouri Feb 26, 2020
363796e
add : new decorations added.
sadrasabouri Feb 26, 2020
9f5cd46
fix : minor bugs fixed.
sadrasabouri Feb 26, 2020
43b9dc4
test : minor test's extra repeated.
sadrasabouri Feb 29, 2020
bf7bcbe
add : decor_list function added.
sadrasabouri Feb 29, 2020
968a7a5
test : tests have been updated with decor_list function.
sadrasabouri Feb 29, 2020
6480f05
log : changes logged.
sadrasabouri Feb 29, 2020
ca4c830
COME ON :|
sadrasabouri Feb 29, 2020
4771687
fix : Trailing whitespace.
sadrasabouri Feb 29, 2020
484889e
fix : unaligned decoration names have been fixed.
sadrasabouri Feb 29, 2020
2ed7487
fix : minor edit in decor_list function
sepandhaghighi Mar 2, 2020
53e2b33
fix : minor edit in indirect_decoration function
sepandhaghighi Mar 2, 2020
734b9d1
fix : __init__ updated
sepandhaghighi Mar 2, 2020
d89d55c
fix : DECORATION_COUNTER added
sepandhaghighi Mar 2, 2020
b13bda7
fix : __init__ updated
sepandhaghighi Mar 2, 2020
0ce2251
doc : CHANGELOG updated
sepandhaghighi Mar 2, 2020
72247f3
Merge pull request #111 from sadrasabouri/dev
sepandhaghighi Mar 2, 2020
2a7e8fc
fix : minor edit in __word2art function
sepandhaghighi Mar 2, 2020
c3cff6f
fix : minor edit in decoration section of text2art function
sepandhaghighi Mar 2, 2020
3440112
fix : error handler added to decor function
sepandhaghighi Mar 2, 2020
fa56bc4
fix : tests updated
sepandhaghighi Mar 2, 2020
244ac1f
doc : README updated
sepandhaghighi Mar 2, 2020
354178d
doc : README updated
sepandhaghighi Mar 2, 2020
9dc52a1
fix : font_check script updated
sepandhaghighi Mar 2, 2020
d0f5678
doc : DecorList.ipynb added
sepandhaghighi Mar 2, 2020
402f94e
fix : minor edit in decor_list function
sepandhaghighi Mar 2, 2020
739a26b
doc : CONTRIBUTING.md updated
sepandhaghighi Mar 2, 2020
09ab240
doc : README updated
sepandhaghighi Mar 2, 2020
4776304
fix : MATLAB example updated
sepandhaghighi Mar 2, 2020
7f3dce6
doc : CHANGELOG updated
sepandhaghighi Mar 2, 2020
cba7b8c
doc : minor edit in README
sepandhaghighi Mar 2, 2020
b2fb14d
doc : minor edit in README.md
sepandhaghighi Mar 3, 2020
ba3c1b2
fix : minor edit in decor_list function
sepandhaghighi Mar 3, 2020
e2c0fb0
fix : minor edit in MATLAB Example2
sepandhaghighi Mar 3, 2020
7d215cf
doc : CHANGELOG updated
sepandhaghighi Mar 3, 2020
d019c60
fix : MATLAB Example3 endline bug fixed
sepandhaghighi Mar 3, 2020
17cf0d4
Merge pull request #112 from sepandhaghighi/decor
sepandhaghighi Mar 3, 2020
db7bfe3
fix : next line detection bug fixed
sepandhaghighi Mar 3, 2020
f4b62b6
fix : tests updated
sepandhaghighi Mar 3, 2020
151b81a
fix : minor edit in tests
sepandhaghighi Mar 3, 2020
a45a8f5
fix : codecov.yml added
sepandhaghighi Mar 3, 2020
1233d86
doc : CHANGELOG updated
sepandhaghighi Mar 4, 2020
d7daff9
fix : minor edit in __word2art function to support first/end \n
sepandhaghighi Mar 4, 2020
1416e31
fix : tests updated
sepandhaghighi Mar 4, 2020
632ed9b
doc : CHANGELOG updated
sepandhaghighi Mar 4, 2020
748c4aa
fix : minor edit in __word2art function
sepandhaghighi Mar 4, 2020
abaed0a
fix : tests updated
sepandhaghighi Mar 4, 2020
40017c3
fix : tests updated
sepandhaghighi Mar 7, 2020
2a0f13e
Merge pull request #114 from sepandhaghighi/nextline-bug
sadrasabouri Mar 7, 2020
59abb40
Fixes tsave function bug (#115)
sepandhaghighi Mar 24, 2020
e8a1c94
rel : migrate to version 4.6
sepandhaghighi Mar 26, 2020
de7db06
doc : notebooks updated for version 4.6
sepandhaghighi Mar 26, 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
31 changes: 25 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ Please consider the following :
3. Add your new features or fix detected bugs
- To add a new font visit [here](#font)
- To add a new 1-line art visit [here](#1-line-art)
- To add a new decoration visit [here](#decoration)
4. Add standard `docstring` to your functions
5. Add tests for new features (`doctest`)
- **Non-ASCII** fonts in `test2.py`
- Other in `test.py`
- **ASCII** fonts/arts in `test.py`
- Other in `test2.py`
6. Update `README.md` (if needed)
7. Pass all CI tests
8. Update `CHANGELOG.md`
Expand Down Expand Up @@ -59,10 +60,28 @@ Please consider the following :
4. If 1-line art is bipartite:
- Add as list (Example : ```"1-line art name": ["string1","string1"]```)
- Add 1-line art name to `RANDOM_FILTERED_ARTS` list
5. Add a test case to `test.py` (*Alphabetical order*)
6. Re-run `ArtList.ipynb`
5. If 1-line art is **Non-ASCII**:
- Add 1-line art name to `NON_ASCII_ARTS` list
- Add a test case to `test2.py` (*Alphabetical order*)
6. If 1-line art is **ASCII**:
- Add a test case to `test.py` (*Alphabetical order*)
- Add 1-line art name to `RANDOM_FILTERED_ARTS` list to remove it from random mode (*Optional*)
7. Re-run `ArtList.ipynb`
- Before this step you should re-install `art` package : ```python setup.py install```
8. Update 2 art counters in `README.md`
- Badge section
- Overview section
9. Update `Reference` section in `README.md`

## Decoration

1. Select a non-duplicate name
2. Add new decoration data as a list to the end of `decor_dic.py`
3. Map decoration name and data in `DECORATIONS_MAP` dictionary
4. Add a test case to `test2.py` (*Alphabetical order*)
5. Re-run `DecorList.ipynb`
- Before this step you should re-install `art` package : ```python setup.py install```
7. Update 2 art counters in `README.md`
6. Update 2 decor counters in `README.md`
- Badge section
- Overview section
8. Update `Reference` section in `README.md`
7. Update `Reference` section in `README.md`
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ matrix:
- os: linux
python: 2.7
include:
- os: linux
python: 3.8
dist: xenial
- os: linux
python: 3.7
dist: xenial
Expand Down
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
10 changes: 8 additions & 2 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.5"
"### Version : 4.6"
]
},
{
Expand Down Expand Up @@ -1540,7 +1540,13 @@
"(:) \n",
"******************************\n",
"victory\n",
"V(-.o)V \n",
"V(-.o)V \n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"******************************\n",
"volcano1\n",
"/\"\\ \n",
Expand Down
58 changes: 57 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,61 @@ 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.6] - 2020-03-30
### Added
- `NON_ASCII_ARTS` list
- `decor_dic.py` file
- `codecov.yml` file
- `decor` function
- `decor_list` function
- `DecorList.ipynb` notebook
- 10 new decorations
1. barcode1
2. champion1
3. chess1
4. lucky1
5. sad1
6. soccer1
7. star1
8. star2
9. wave1
10. wave2
- 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
### Changed
- `README.md` modified
- `CONTRIBUTING.md` modified
- MATLAB examples updated
- `setup.py` modified
- `coverage` dependency moved to `extras_require`
- Test system modified
- `random` mode modified
- `test` parameter removed from `font_list` function
- `mode` parameter added to `font_list` and `art_list` functions
- `decoration` parameter added to `text2art`, `tprint` and `tsave` functions
- `\n` support bug fixed
- `tsave` function bug in Windows fixed
### Removed
- `requirements.txt`
## [4.5] - 2020-01-29
### Added
- 35 new fonts
Expand Down Expand Up @@ -1359,7 +1414,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.5...dev
[Unreleased]: https://github.com/sepandhaghighi/art/compare/v4.6...dev
[4.6]: https://github.com/sepandhaghighi/art/compare/v4.5...v4.6
[4.5]: https://github.com/sepandhaghighi/art/compare/v4.4...v4.5
[4.4]: https://github.com/sepandhaghighi/art/compare/v4.3...v4.4
[4.3]: https://github.com/sepandhaghighi/art/compare/v4.2...v4.3
Expand Down
135 changes: 135 additions & 0 deletions DecorList.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
{
"cells": [
{
"cell_type": "markdown",
"metadata": {},
"source": [
"# ART"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 4.6"
]
},
{
"cell_type": "code",
"execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
"from art import *"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"## Decoration Counter"
]
},
{
"cell_type": "code",
"execution_count": 2,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"10"
]
},
"execution_count": 2,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"DECORATION_COUNTER"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"⚠️ Some environments don't support all decorations"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"## Decoration List"
]
},
{
"cell_type": "code",
"execution_count": 3,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"barcode1\n",
"▌│█║▌║▌║ ƭεรƭ ║▌║▌║█│▌\n",
"******************************\n",
"champion1\n",
"◄[🏆]► ƭεรƭ ◄[🥇]►\n",
"******************************\n",
"chess1\n",
"▀▄▀▄▀▄ƭεรƭ▄▀▄▀▄▀\n",
"******************************\n",
"lucky1\n",
"🌈ꔣᨐ ƭεรƭ ᨐꔣ🌈\n",
"******************************\n",
"sad1\n",
"(-_-) ƭεรƭ (-_-)\n",
"******************************\n",
"soccer1\n",
"●●--●●◄⚽️► ƭεรƭ ◄⚽️►●●--●●\n",
"******************************\n",
"star1\n",
"【★】 ƭεรƭ 【★】\n",
"******************************\n",
"star2\n",
"★·.·´¯`·.·★ ƭεรƭ ★·.·´¯`·.·★\n",
"******************************\n",
"wave1\n",
"▁ ▂ ▄ ▅ ▆ ▇ █ƭεรƭ█ ▇ ▆ ▅ ▄ ▂ ▁\n",
"******************************\n",
"wave2\n",
"▉▇▆▅▄▃▂▂▂_ƭεรƭ_▂▂▃▄▅▆▇▉▉\n",
"******************************\n"
]
}
],
"source": [
"decor_list()"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.5.2"
}
},
"nbformat": 4,
"nbformat_minor": 2
}
Loading