Merge pull request #18 from Kronopt/master

V2 API and python3 support

Author: Naramsim

.circleci/config.yml

@@ -0,0 +1,42 @@
+# Config file for automatic testing at circleci.com
+
+version: 2
+
+jobs:
+  py27_tests:
+    docker:
+      - image: circleci/python:2.7.15
+    steps:
+      - checkout
+      - run:
+          command: |
+            pip install -r requirements.txt --user
+            python -m unittest tests.test_pykemon
+
+  py36_tests:
+    docker:
+      - image: circleci/python:3.6.6
+    steps:
+      - checkout
+      - run:
+          command: |
+            pip install -r requirements.txt --user
+            python -m unittest tests.test_pykemon
+
+  py37_tests:
+    docker:
+      - image: circleci/python:3.7.0
+    steps:
+      - checkout
+      - run:
+          command: |
+            pip install -r requirements.txt --user
+            python -m unittest tests.test_pykemon
+
+workflows:
+  version: 2
+  run_tests:
+    jobs:
+      - py27_tests
+      - py36_tests
+      - py37_tests

.gitignore

@@ -44,3 +44,9 @@ docs/_build
 
 # htmlcov
 htmlcov/
+
+# Pycharm
+.idea/
+
+# virtual environment
+venv/

.travis.yml

@@ -4,9 +4,15 @@ language: python
 
 python:
   - "2.7"
+  - "3.6"
+  - "3.7"
+
+# Travis still doesn't support Python 3.7 yet, so the following 2 lines are needed
+dist: xenial
+sudo: true
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements.txt
 
 # command to run tests, e.g. python setup.py test
-script: py.test test
+script: python -m unittest tests.test_pykemon

AUTHORS.rst

@@ -11,5 +11,6 @@ Contributors
 ------------
 
 * Owen Hallett
+* Kronopt
 
 Made a commit? Add your name to the list!

CONTRIBUTING.rst

@@ -13,7 +13,7 @@ Types of Contributions
 Report Bugs
 ~~~~~~~~~~~
 
-Report bugs at https://github.com/phalt/pykemon/issues.
+Report bugs at https://github.com/PokeAPI/pykemon/issues.
 
 If you are reporting a bug, please include:
 
@@ -43,7 +43,7 @@ articles, and such.
 Submit Feedback
 ~~~~~~~~~~~~~~~
 
-The best way to send feedback is to file an issue at https://github.com/phalt/pykemon/issues.
+The best way to send feedback is to file an issue at https://github.com/PokeAPI/pykemon/issues.
 
 If you are proposing a feature:
 
@@ -74,13 +74,13 @@ Ready to contribute? Here's how to set up `pykemon` for local development.
    
    Now you can make your changes locally.
 
-5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
+5. When you're done making changes, check that your changes pass flake8, pep8 and the tests, including testing other Python versions with tox::
 
+    $ pep8 pykemon
     $ flake8 pykemon tests
-    $ python setup.py test
     $ tox
 
-   To get flake8 and tox, just pip install them into your virtualenv. 
+   To get flake8 and tox, just pip install them into your virtualenv.
 
 6. Commit your changes and push your branch to GitHub::
 
@@ -99,7 +99,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, and 3.3, and for PyPy. Check 
+3. The pull request should work for Python 2.7, 3.6, and 3.7. Check
    https://travis-ci.org/phalt/pykemon/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

HISTORY.rst

@@ -3,6 +3,20 @@
 History
 -------
 
+0.4.0 (2018-10-11)
+++++++++++++++++++
+
+* Removed code from pre-beckett versions
+* Removed V1 API support, as it is now deprecated
+* Added some tweaks to the beckett package
+
+0.3.0 (2017-10-19)
+++++++++++++++++++
+
+* V2 support added
+* Added some missing V1 resources
+* Removed files related to API 0.1
+
 0.2.0 (2016-06-11)
 ++++++++++++++++++
 
@@ -24,5 +38,5 @@ History
 ++++++++++++++++++
 
 * First release on PyPI.
-* All PokeAPI resources fully supported and represented in an object-oriented style.
+* All PokeAPI resources fully supported and represented in an object-oriented style
 * Easy-to-use API: just one method!

Makefile

@@ -27,7 +27,7 @@ lint:
 	flake8 pykemon tests
 
 test:
-	py.test tests/
+	python -m unittest tests.test_pykemon
 
 test-all:
 	tox

README.rst

@@ -8,7 +8,7 @@ Pykemon
 .. image:: https://circleci.com/gh/PokeAPI/pykemon.svg?style=svg
     :target: https://circleci.com/gh/PokeAPI/pykemon
 
-A python wrapper for `PokeAPI <http://pokeapi.co>`_
+A python wrapper for `PokeAPI <https://pokeapi.co>`_
 
 * Free software: BSD license
 * Documentation: http://pykemon.rtfd.org.
@@ -32,14 +32,13 @@ Even simpler:
 .. code-block:: python
 
     >>> import pykemon
-    >>> client = pykemon.V1Client()
-    >>> p = client.get_pokemon(uid=1)
-    [<Pokemon - Bulbasaur>]
+    >>> client = pykemon.V2Client()
+    >>> client.get_pokemon(1)[0]
+    <Pokemon - Bulbasaur>
 
 
 Features
 --------
 
 * Generate Python objects from PokeAPI resources.
-
 * Human-friendly API

docs/installation.rst

@@ -4,9 +4,4 @@ Installation
 
 At the command line::
 
-    $ easy_install pykemon
-
-Or, if you have virtualenvwrapper installed::
-
-    $ mkvirtualenv pykemon
-    $ pip install pykemon
+    $ pip install pykemon

docs/pykemon.rst

@@ -12,26 +12,18 @@ pykemon.api module
     :undoc-members:
     :show-inheritance:
 
-pykemon.exceptions module
--------------------------
+pykemon.beckett_tweaks module
+--------------------------
 
-.. automodule:: pykemon.exceptions
+.. automodule:: pykemon.beckett_tweaks
     :members:
     :undoc-members:
     :show-inheritance:
 
-pykemon.models module
----------------------
+pykemon.resourcesV2 module
+--------------------------
 
-.. automodule:: pykemon.models
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-pykemon.request module
-----------------------
-
-.. automodule:: pykemon.request
+.. automodule:: pykemon.resourcesV2
     :members:
     :undoc-members:
     :show-inheritance: