Merge pull request #19 from Kronopt/master

Fix ChainLink. Update tests
PokeAPI · Nov 5, 2018 · ed34862 · ed34862
2 parents 4adf80f + 6e63e82
commit ed34862
Show file tree

Hide file tree

Showing 14 changed files with 707 additions and 108 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,29 +9,38 @@ jobs:
     steps:
       - checkout
       - run:
-          command: |
-            pip install -r requirements.txt --user
-            python -m unittest tests.test_pykemon
+          name: Install Requirements
+          command: pip install -r requirements.txt -r requirements-dev27.txt --user
+      - run:
+          name: Run Tests
+          command: 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
+          name: Install Requirements
+          command: pip install -r requirements.txt -r requirements-dev27.txt --user
+      - run:
+          name: Run Tests
+          command: 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
+          name: Install Requirements
+          command: pip install -r requirements.txt -r requirements-dev.txt --user
+      - run:
+          name: Lint
+          command: python -m pylint pykemon tests setup.py
+      - run:
+          name: Run Tests
+          command: python -m unittest tests.test_pykemon
 
 workflows:
   version: 2

diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,6 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
-nosetests.xml
 
 # Translations
 *.mo