Commit graph

299 commits

Author SHA1 Message Date
Samuel Henrique
f7be3ea7b0 FIxes line length and custom pokemon loading. 2017-07-01 13:50:54 -03:00
Lazo
8a6e42c051 Merge pull request #75 from cclauss/patch-2
De-duplication: nidoran*2 --> nidoran-f, nidoran-m
2017-07-01 12:40:50 -04:00
Lazo
3b5c97d188 Merge pull request #78 from samosaara/patch-1
Update README.md
2017-07-01 12:40:15 -04:00
Samuel Henrique
622f65e018 Identation. 2017-07-01 09:44:01 -03:00
Samuel Henrique
a6c057175c Update README.md
Install instructions and new type sub-command.
2017-07-01 09:39:41 -03:00
cclauss
b363a479a8 De-duplication: nidoran*2 --> nidoran-f, nidoran-f
The need for this change is discussed at 
https://github.com/LazoCoder/Pokemon-Terminal/pull/70#pullrequestreview-47279098

The other two possibilities, nidoran-♀ and nidoran-♂ were discussed there.
@samosaara Please review this PR.
2017-07-01 05:01:56 +02:00
Lazo
83fa1c30e1 Merge pull request #70 from samosaara/master
Improves and unifies pokemon database, type subcommand
2017-06-30 18:53:05 -04:00
Lazo
45d4146b2f Merge branch 'master' into master 2017-06-30 17:37:05 -04:00
Lazo
596ff7ec6e Merge pull request #60 from cclauss/patch-2
Create .travis.yml
2017-06-30 17:08:53 -04:00
Lazo
4b2fbb4dba Merge pull request #69 from cclauss/patch-4
Make main() a separate function so we can test it
2017-06-30 17:05:52 -04:00
Samuel Henrique
26b2c396b6 Local escape code variables. 2017-06-29 16:36:16 -03:00
Samuel Henrique
4fc2c613ef Type commands 2017-06-29 15:17:16 -03:00
cclauss
7e84a4f5c6 Create a global Database instance at startup time 2017-06-29 19:42:55 +02:00
cclauss
7b4a7656fc Remove Python 2 from testing and add Python 3.5.0
Pokemon-Terminal does not support Python 2.
2017-06-29 19:08:52 +02:00
cclauss
911dff25f3 named_tuple --> namedtuple 2017-06-29 18:59:02 +02:00
Samuel Henrique
382bd801f9 Unifies database and adds pokemon types 2017-06-29 13:40:06 -03:00
cclauss
2159a6b52f end = len(db) if region_name == "extra" else region_record.end 2017-06-29 09:43:56 +02:00
cclauss
c02d469144 Added test_regions() 2017-06-29 09:25:12 +02:00
cclauss
9c5b040571 Make main() a separate function so we can test it
This will enable us to use [pytest](https://docs.pytest.org) to do end-to-end tests like:
https://github.com/LazoCoder/Pokemon-Terminal/pull/60/files#diff-1532f81ff7af5d26a72ae57cdbeabb53R19
2017-06-29 09:00:39 +02:00
cclauss
7c10577226 pytest --capture=sys # for testing text on stdout 2017-06-28 06:44:37 +02:00
cclauss
16c49a97c1 Make main() a separate function so we can test it 2017-06-28 06:40:52 +02:00
cclauss
29a5f4c0f8 Create test_main.py
To run the tests do: `python -m pytest --capture=sys`
2017-06-28 06:36:06 +02:00
cclauss
39b4e4d3fc Undoing ALL the changes to unittest.py 2017-06-28 06:20:44 +02:00
cclauss
3923f8f8e2 Undoing changes to unittest.py 2017-06-28 06:19:18 +02:00
cclauss
89b1992504 Three pytest tests 2017-06-28 00:16:00 +02:00
cclauss
7512521244 Install and run pytest 2017-06-28 00:14:08 +02:00
Lazo
b32ed4b9e2 Merge pull request #63 from IamCarbonMan/master
Added light and dark options
2017-06-25 19:02:49 -04:00
Griffin Young
f21446be6e fixed light threshold 2017-06-25 15:39:03 -07:00
Griffin Young
04f665f970 fix help message and name vs id conflict 2017-06-25 13:07:45 -07:00
Griffin Young
62fceca4fa changed id -> name in light/dark data file 2017-06-25 12:25:40 -07:00
IamCarbonMan
46da64488a Update README.md 2017-06-25 11:26:03 -07:00
IamCarbonMan
97ce1dafc7 Merge branch 'master' into master 2017-06-25 11:17:58 -07:00
Griffin Young
b8c7197c1c unit test light-dark scale goes from 1-10 instead of 0-1 2017-06-25 11:15:44 -07:00
Griffin Young
016c0fc91f added threshold and all options to get_light/get_dark. added full light-dark table. added unit test 2017-06-25 11:12:45 -07:00
Lazo
6bf97a0e3d Update README.md 2017-06-25 13:15:20 -04:00
Lazo
e72de8c93b Merge pull request #57 from dosman711/add-random-shuffle
Add random shuffle option to slideshow
2017-06-25 13:10:05 -04:00
Chris Baker
f3ff4428f6 messed up compare for slideshow 2017-06-24 20:49:57 -07:00
Griffin Young
f52c73ed9b added light and dark options 2017-06-24 19:51:50 -07:00
Lazo
32d5457251 Update README.md 2017-06-24 17:18:48 -04:00
Lazo
ad066a4358 Merge pull request #58 from cclauss/patch-1
Simplify with in
2017-06-24 16:54:29 -04:00
Lazo
b3ce0cb72a Merge pull request #61 from LazoCoder/Better-Compression
Upgraded compression
2017-06-24 15:37:31 -04:00
LazoCoder
1a9c69c637 Upgraded compression
Replaced pngquant compression with imageoptim compression.

Quality is better and size is smaller. Backgrounds went from ~30mb -> ~17mb and Samples went from ~7mb to ~4mb.

Also fixed bug with clear | off | disable.
2017-06-24 15:35:15 -04:00
Chris Baker
5adff0fdad update README 2017-06-24 08:32:17 -07:00
cclauss
a30a02e666 Ensure latest and greatest version of Python 2017-06-24 16:41:33 +02:00
cclauss
48a0802f5a Remove before_install 2017-06-24 16:39:28 +02:00
cclauss
03d7121508 Create .travis.yml
This will automatically run [flake8](https://flake8.pycqa.org) tests and `unittest.py` on every pull request to this repo.  This will help contributors know if their submissions would break the build.  To turn on this free service, you would need to do steps 1 and 2 of https://docs.travis-ci.com/user/getting-started/
2017-06-24 16:37:56 +02:00
cclauss
15da2260d8 Simplify with in 2017-06-24 07:08:57 +02:00
Chris Baker
b7619c8f7a Add random shuffle option to slideshow
This adds 2 new options for slideshow, `rnd-slideshow [time]` and
`rnd-slideshow-<region> [time]`. Also some cleanup to help text to
help it all fit.
2017-06-23 21:58:03 -07:00
Lazo
d0d46cec4e Merge pull request #51 from cclauss/patch-2
Simplify with triple quoted strings and str.format()
2017-06-23 22:16:56 -04:00
Lazo
de31733371 Merge pull request #50 from cclauss/patch-1
Use a multiline string to simplify the OSA script
2017-06-23 22:16:23 -04:00