Commit graph

201 commits

Author SHA1 Message Date
Zane Adickes
791d6853d6 forgot to uncomment some things 2016-02-16 01:47:05 -05:00
Zane Adickes
ec58b95478 images implemented for pokmon, pokemon forms and items 2016-02-16 01:31:19 -05:00
Zane Adickes
fdcfae9c5c merge with phalt 2016-02-12 23:44:08 -05:00
Ben Chauvette
84b8e7c256 Fix leftover merge conflict from stash 2016-02-11 22:36:39 -05:00
Zane Adickes
396bbd45ae adding some images 2016-02-10 08:09:36 -05:00
Zane Adickes
399643aa87 get started 2016-02-09 23:11:37 -05:00
Paul Hallett
1b59324630 Merge pull request #81 from zaneadix/new-ui
New ui
2016-01-31 12:03:26 +00:00
Zane Adickes
d6ca4a3f60 had a stash mistake on the last push. this should be a complete push 2016-01-26 21:09:44 -05:00
Zane Adickes
d0909e1cc3 updated data with all of latest veekun updates 2015-12-28 00:00:14 -05:00
Adickes
1f41e3c17f remove templating from strings when building database 2015-12-27 00:42:41 -05:00
nimaje
33ae7a6073 avoid starimports
don't use starimports so don't use them in examples
2015-12-07 21:29:39 +01:00
Adickes
b58a5b76c3 a few doc changes 2015-12-07 15:17:33 -05:00
Courtney Strachan
41662657a1 Update build.py - remove duplicate data load
I noticed that there was a duplicate PokemonGameIndex import in the original build.py for the v2 import. It's still in your updated build.py so I edited it out.
2015-12-05 18:54:09 -08:00
Benjamin Takacs
35240b3ae5 renamed prozess_csv to process_csv 2015-12-05 13:21:56 +01:00
Benjamin Takacs
5e5854fb7b One function for each group of models¬
NOT TESTED YET! Buildscript has not finished yet (needed about 18h until now).

Made `data/v2/__init__.py` and `config/local.py` python3 compatible.

Writen helper functions because of repeating code:
  + `process_csv`
  + `build_generic`
useage demonstrated with `_build_languages`.

Writen `with_iter` for closing files automatical
when the processing has finished.

Writen for each group of models a function (named `build_`groupname)
and a function `build_all` which calls these functions.
2015-12-05 12:13:46 +01:00
Adickes
3d8e9a7649 tests now handling all convenience attributes in all apis 2015-11-26 02:18:35 +01:00
Adickes
1f480cedac tests covering all endpoints. working on adding some convenience attributes to api resources to help connect them two way style. tests will probably need some small tweaks 2015-11-15 22:29:30 -05:00
Adickes
75e39ba530 cleaned up the berry mess 2015-11-10 14:20:06 -05:00
Adickes
aa1d7d9939 fished serving almost all data (with the exception of machines and some csv files that didnt have data yet but have been updated in veekuns repo. TESTS STILL NEED TO BE DONE. 2015-11-08 16:26:02 -05:00
Adickes
c1f1f9ace7 apis for locations, location areas, encounters, encounter rates, characteristics, contests, super contests 2015-11-05 09:55:14 -05:00
Adickes
db91f73085 fix build steps 2015-10-29 15:09:28 -04:00
Adickes
b099558de2 starting a few more api endpoints (locations and encounters) 2015-10-29 13:46:15 -04:00
Zane Adickes
ede6577c17 whoops I commented a bunch of crap out 2015-10-28 00:28:21 -04:00
Adickes
44151e1963 Finished tests for all current API endpoints (34 of them) 2015-10-27 09:36:33 -04:00
Adickes
f3654c3458 half of api tests are done 2015-10-23 00:56:01 -04:00
Adickes
f175d6323f Merge branch 'master' of https://github.com/phalt/pokeapi into safe-merge 2015-10-06 18:42:03 -04:00
Adickes
df503e3424 About 80% of data is being served 2015-10-06 13:09:07 -04:00
Adickes
5de650ebea got some functions working. issue with egg groups though 2015-10-03 00:36:39 -04:00
Adickes
6d7fd53ece little more work on pokemon evolution chains 2015-10-02 23:40:21 -04:00
Adickes
163e29c527 Renamed PokemonMoveMethod models to MoveLearnMethod because it just damn well makes more sense when I'm reading the code and I assume anyone else will feel the same way. Also, progress on many api resources. 2015-09-26 23:20:19 -05:00
Zane Adickes
3b8b1a6cf0 Pokedex resources. Getting closer to Pokemon resources 2015-09-15 08:26:47 -04:00
Adickes
b8cf2128a3 Serving Language, Generation, Version, Ability, Type 2015-09-12 00:53:46 -04:00
Zane Adickes
8eff28a872 Getting started with the APIs. A few serving lists and details by name or pk 2015-09-09 00:28:33 -04:00
Zane Adickes
e830c8c47f Merge branch 'New-Data' into Complete-Models 2015-05-18 22:29:10 -04:00
Paul Hallett
b7e6145bce Merge pull request #40 from zaneadix/Complete-Models
Complete models and improved build script
2015-05-18 09:12:09 +01:00
Zane Adickes
bd508937ae Additional Data
Filling out remaining data so Models have complete associations.
Data and models added for:
Pokemon
Moves
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
2015-04-20 23:38:33 -04:00
Zane Adickes
49926dc026 Completed Models/Build Script
-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build script

-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db

-Build script now runs against both postgres and sqlite (dev)

-Added all models to admin site registry

-Added instructions for building out db in README
2015-04-20 23:31:59 -04:00
Zane Adickes
5ad1cb0ea5 Revert "Pokemon/Move Models"
This reverts commit 1882c47f90.
2015-04-20 21:46:34 -04:00
Zane Adickes
5e9296f948 Revert "Added Remaining Data and Models"
This reverts commit b069ee991b.
2015-04-20 21:43:55 -04:00
Zane Adickes
87b53aadbf Revert b069ee9..28035e5
This rolls back to commit b069ee991b.
2015-04-20 21:43:18 -04:00
Zane Adickes
28035e5aeb Merge remote-tracking branch 'origin/master'
Conflicts:
	data/v2/build.py
2015-04-19 22:26:20 -04:00
Zane Adickes
b069ee991b Added Remaining Data and Models
Data and models added for:
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
2015-04-19 22:24:14 -04:00
Zane Adickes
4890407482 Just adding instructions
really complicated things
2015-04-12 22:48:28 -04:00
Zane Adickes
1882c47f90 Pokemon/Move Models
-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build script

-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db

-Build script now runs against both postgres and sqlite (dev)

-Some v2 cvs files had no data in them. Pulled in the data from veekun
where necessary.

-Added all models to admin site registry

-Added instructions for building out db in README
2015-04-12 22:29:36 -04:00
Zane Adickes
b6b6ff0938 Move Models
Created models for all move related models and added build steps for
each
2015-04-09 00:45:23 -04:00
Zane Adickes
fc4fe24270 More of the same for now 2015-04-07 08:14:31 -04:00
Zane Adickes
9a255298fc More Models
Whole bunch of modelin’ goin’ on around here
2015-04-06 00:27:59 -04:00
Zane Adickes
d9720665b8 more ability stuff 2015-04-03 08:03:02 -04:00
Zane Adickes
7a7c2d9737 ability stuff 2015-04-02 08:21:39 -04:00
phalt
ab3276ecd1 explain myself 2014-12-04 19:55:38 +00:00
phalt
21a1d4bf46 initial commit 2014-12-04 11:11:46 +00:00