Release 2.6.0

.gitignore

@@ -11,3 +11,5 @@ sphinx/_build/*
 .idea/*
 .tox/*
 .coverage
+tests/functional/.tox/*
+.cache

CONTRIBUTORS.md

@@ -5,9 +5,11 @@ Contributors will be shown in alphabetical order
 
 Code
 ----
+  * [alechewitt] (https://github.com/alechewitt)
   * [dphildebrandt] (https://github.com/dphildebrandt)
   * [dstmar] (https://github.com/dstmar)
   * [ggstuart] (https://github.com/ggstuart)
+  * [lardconcepts] (https://github.com/lardconcepts)
   * [liato] (https://github.com/liato)
   * [LukasBoersma] (https://github.com/LukasBoersma)
   * [Noid] (https://github.com/n0id)
@@ -18,6 +20,10 @@ Testing
 -------
   * [Samuel Yap] (https://github.com/samuelyap)
 
+Packaging and Distribution
+--------------------------
+  * [Diapente] (]https://github.com/Diapente)
+
 Wiki
 ----
   * [richarddunks] (https://github.com/richarddunks)

Dockerfile

@@ -7,13 +7,15 @@ RUN apt-get update && \
 RUN echo -ne '\n' |  apt-add-repository ppa:fkrull/deadsnakes
 RUN apt-get update && \
     apt-get upgrade -y && \
-    apt-get install python2.7 python3.2 python3.3 python3.5 python-pip -y
+    apt-get install python2.7 python3.2 python3.3 python3.5 python-pip \
+    ipython ipython3 -y
 RUN wget https://bootstrap.pypa.io/ez_setup.py -O - | python && \
     wget https://bootstrap.pypa.io/ez_setup.py -O - | python3
 
 ADD . /pyowm
 WORKDIR /pyowm
 
-RUN pip install -r /pyowm/dev-requirements.txt
+RUN pip install --upgrade setuptools pip && \
+    pip install -r /pyowm/dev-requirements.txt
 
 CMD tail -f /dev/null

README.md

@@ -11,13 +11,18 @@ PyOWM is a client Python wrapper library for the OpenWeatherMap (OWM) web API.
 
 It allows quick and easy consumption of OWM weather data from Python applications via a simple object model and in a human-friendly fashion.
 
-No additional libraries are requested: only the Python standard library modules.
+PyOWM runs on Python 2.7 and Python 3.2+, and integrates with [Django 1.10+ models](https://github.com/csparpa/pyowm/wiki/Django-support).
 
-##  Support
 
-PyOWM currently supports _version 2.5_ of the OWM API
+##  Installation
+
+Install with `pip` for your ease:
+
+```shell
+$ pip install pyowm
+```
 
-PyOWM runs on Python 2.7 and Python 3.2+
+There is a lot of alternatives: [setuptools](https://github.com/csparpa/pyowm/wiki/Install#install-from-source-with-setuptools), [Windows installers](https://github.com/csparpa/pyowm/wiki/Install#windows-exe) and common package managers such as [Yaourt](https://github.com/csparpa/pyowm/wiki/Install#on-archlinux-with-yaourt)
 
 ##  Usage
 
@@ -37,7 +42,7 @@ import pyowm
 
 owm = pyowm.OWM('your-API-key')  # You MUST provide a valid API key
 
-# You have a pro subscription? Use:
+# Have a pro subscription? Then use:
 # owm = pyowm.OWM(API_key='your-API-key', subscription_type='pro')
 
 # Will it be sunny tomorrow at this time in Milan (Italy) ?
@@ -61,38 +66,20 @@ w.get_temperature('celsius')  # {'temp_max': 10.5, 'temp': 9.7, 'temp_min': 9.0}
 observation_list = owm.weather_around_coords(-22.57, -43.12)
 ```
 
-##  Installation
-
-Use `pip` for your ease:
-
-```shell
-$ pip install pyowm
-```
-
-There is a lot of alternatives: [setuptools](https://github.com/csparpa/pyowm/wiki/Install#install-from-source-with-setuptools),
-[Windows installers](https://github.com/csparpa/pyowm/wiki/Install#windows-exe) and
-common package managers such as [Yaourt](https://github.com/csparpa/pyowm/wiki/Install#on-archlinux-with-yaourt)
+PyOWM usage examples are available [here](https://github.com/csparpa/pyowm/blob/master/pyowm/docs/usage-examples.md).
 
 ## Documentation
-Each release has its own changelog on the [changelogs wiki page](https://github.com/csparpa/pyowm/wiki/Changelog).
-
-PyOWM usage examples are available in [the wiki](https://github.com/csparpa/pyowm/wiki/Usage-examples).
+Each release has its own [changelog](https://github.com/csparpa/pyowm/wiki/Changelog).
 
 The library API documentation is available on [Read the Docs](https://pyowm.readthedocs.org).
 
 
-## License
-[MIT](https://github.com/csparpa/pyowm/blob/master/LICENSE) license
-
-
 ## Contributing
 
-## Development
-_Contributors (code, testing, issues reporting) are welcome!_.
+_Contributors (coding, testing, packaging, reporting issues) are welcome!_.
 
 See the [notes on development](https://github.com/csparpa/pyowm/wiki/Notes-on-development) wiki page to get started.
 
-### Testing
 See the [notes on testing](https://github.com/csparpa/pyowm/wiki/Notes-on-testing) wiki page to get started
 
 
@@ -104,3 +91,7 @@ Join the [PyOWM public Slack team](https://pyowm.slack.com) by signing up [here]
 * If you liked PyOWM, [consider giving me a tip](https://gratipay.com/csparpa)!
 * [OpenWeatherMap website](http://openweathermap.org/)
 * [OpenWeatherMap web API docs](http://openweathermap.org/api)
+
+
+## License
+[MIT license](https://github.com/csparpa/pyowm/blob/master/LICENSE)

dev-requirements.txt

@@ -1,4 +1,7 @@
 coverage==3.7.1
+django==1.10.2
+pytest==3.0.3
 Sphinx==1.2.1
 tox==1.9.2
 virtualenv==12.0.7
+twine==1.8.1