exercism · ramiroluz · Nov 11, 2015 · Nov 12, 2015 · Nov 26, 2015 · Nov 25, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,17 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - nightly
+
+matrix:
+  allow_failures:
+    - python: nightly
 
 install:
-  - pip install flake8
+  - pip install -r requirements-travis.txt
 
 before_script:
-  # ignore:
-  # * E501 - line length limit
-  - flake8 . --ignore=E501
+  - flake8 ./exercises/ --max-line-length=99 --select=E,W
 
 script:
   - ./test/check-exercises.py

diff --git a/README.md b/README.md
@@ -1,12 +1,13 @@
 # xPython
 
-[![Build Status](https://travis-ci.org/exercism/xpython.png?branch=master)](https://travis-ci.org/exercism/xpython)
+[![Build Status](https://travis-ci.org/exercism/xpython.png?branch=master)](https://travis-ci.org/exercism/xpython) [![Requirements Status](https://requires.io/github/exercism/xpython/requirements.svg?branch=master)](https://requires.io/github/exercism/xpython/requirements/?branch=master)
+[![Join the chat at https://gitter.im/exercism/xpython](https://badges.gitter.im/exercism/xpython.svg)](https://gitter.im/exercism/xpython?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Exercism exercises in Python
 
 ## Contributing Guide
 
-Please see the [contributing guide](https://github.com/exercism/x-api/blob/master/CONTRIBUTING.md#the-exercise-data)
+Please see the [contributing guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md)
 
 ## Working on the Exercises
 
@@ -18,22 +19,27 @@ Therefore please test your changes at least with Python2.7 and Python3.5.
 
 To test a single exercise, say crypto-square, run:
 ```
-python2.7 test/check_exercises.py crypto-square
+python2.7 test/check-exercises.py crypto-square
 ```
 and
 ```
-python3.5 test/check_exercises.py crypto-square
+python3.5 test/check-exercises.py crypto-square
 ```
 
 To run the tests for all exercises type:
 ```
-python test/check_exercises.py
+python test/check-exercises.py
 ```
 
 ## Code Style
 
-The Python code in this repo is meant to largely obey the [PEP8 style guide](https://www.python.org/dev/peps/pep-0008/) (not all code does though).
-Try the [flake8](http://flake8.readthedocs.org/en/latest/) tool if you feel unsure about questions of style.
+The Python code in this repo is meant to largely obey the [PEP8 style guide](https://www.python.org/dev/peps/pep-0008/).
+
+This repo uses [flake8](http://flake8.readthedocs.org/en/latest/) to enforce the coding standard. When you submit a PR, it needs to pass the flake8 tool with no warnings, or it won't be accepted. Here are the settings used by the build system:
+
+```
+flake8 [your-code-here.py] --max-line-length=99 --select=E,W
+```
 
 ## Pull Requests
 
@@ -48,10 +54,13 @@ If there are more details to add, put those into the body of the commit message.
 
 If you're interested, Tim Pope even has an [entire blog post](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) on good commit messages.
 
-If you're new to Git take a look at [this short guide](http://help.exercism.io/git-workflow.html).
+If you're new to Git take a look at [this short guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md#git-basics).
 
 ## License
 
 The MIT License (MIT)
 
 Copyright (c) 2014 Katrina Owen, [email protected]
+
+## Python icon
+The Python logo is an unregistered trademark. We are using a derived logo with the permission of the Python Software Foundation.
diff --git a/SETUP.md b/SETUP.md
@@ -6,4 +6,4 @@ For example, if you're submitting `bob.py` for the Bob exercise, the submit comm
 
 
 For more detailed information about running tests, code style and linting,
-please see the [help page](http://help.exercism.io/getting-started-with-python.html).
+please see the [help page](http://exercism.io/languages/python).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ For example, if you're submitting `bob.py` for the Bob exercise, the submit comm


		For more detailed information about running tests, code style and linting,
		please see the [help page](http://help.exercism.io/getting-started-with-python.html).
		please see the [help page](http://exercism.io/languages/python).