Merge branch 'patch-017' into 'master'

Switch crypto library `pycrypto` to `pycryptodome`

See merge request jaywink/federation!130

CHANGELOG.md

@@ -1,11 +1,19 @@
 # Changelog
 
-## [0.17.0-dev] - unreleased
+## [0.18.0-dev] - unreleased
 
 ### Changed
 
 * **Backwards incompatible.** Lowest compatible Python version is now 3.6.
 
+## [0.17.0] - 2018-08-11
+
+### Fixed
+
+* Switch crypto library `pycrypto` to `pycryptodome`, which is a more up to date fork of the former. This fixes CVE-2018-6594 found in the former.
+
+  **Deployment note.** When updating an application, you *must* uninstall `pycrypto` first, otherwise there will be a conflict if both the versions are installed at the same time. To uninstall, do `pip uninstall pycrypto`.
+
 ## [0.16.0] - 2018-07-23
 
 ### Added

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/jaywink/federation.svg?branch=master)](https://travis-ci.org/jaywink/federation) [![codecov.io](https://codecov.io/github/jaywink/federation/coverage.svg?branch=master)](https://codecov.io/github/jaywink/federation?branch=master) [![Code Health](https://landscape.io/github/jaywink/federation/master/landscape.svg?style=flat)](https://landscape.io/github/jaywink/federation/master) [![Dependency Status](https://gemnasium.com/badges/github.com/jaywink/federation.svg)](https://gemnasium.com/github.com/jaywink/federation) [![Stories in Ready](https://badge.waffle.io/jaywink/federation.png?label=ready&title=Board)](https://waffle.io/jaywink/federation)
+[![Build Status](https://travis-ci.org/jaywink/federation.svg?branch=master)](https://travis-ci.org/jaywink/federation) [![codecov.io](https://codecov.io/github/jaywink/federation/coverage.svg?branch=master)](https://codecov.io/github/jaywink/federation?branch=master) [![Code Health](https://landscape.io/github/jaywink/federation/master/landscape.svg?style=flat)](https://landscape.io/github/jaywink/federation/master)
 
 [![PyPI version](https://badge.fury.io/py/federation.svg)](https://pypi.python.org/pypi/federation)  [![Documentation Status](http://readthedocs.org/projects/federation/badge/?version=latest)](http://federation.readthedocs.io/en/latest/?badge=latest) [![PyPI](https://img.shields.io/pypi/pyversions/federation.svg?maxAge=2592000)](https://pypi.python.org/pypi/federation) [![PyPI](https://img.shields.io/pypi/l/federation.svg?maxAge=2592000)](https://pypi.python.org/pypi/federation)
 
@@ -42,4 +42,4 @@ See [development and support documentation](http://federation.readthedocs.io/en/
 
 ### Author
 
-Jason Robinson / https://jasonrobinson.me / https://github.com/jaywink
+Jason Robinson / https://jasonrobinson.me / https://github.com/jaywink / https://git.feneas.org/jaywink

docs/development.rst

@@ -3,9 +3,9 @@ Development
 
 Help is more than welcome to extend this library. Please see the following resources.
 
-* `Source code repo <https://github.com/jaywink/federation>`_
-* `Issue tracker <https://github.com/jaywink/federation/issues>`_
-* `Kanban board <https://waffle.io/jaywink/federation>`_
+* `Source code repo <https://git.feneas.org/jaywink/federation>`_
+* `Issue tracker <https://git.feneas.org/jaywink/federation/issues>`_
+* `Kanban board <https://git.feneas.org/jaywink/federation/boards>`_
 
 Environment setup
 -----------------

docs/introduction.rst

@@ -40,5 +40,5 @@ License
 Author
 ......
 
-Jason Robinson / `jasonrobinson.me <https://jasonrobinson.me>`_ / `GitHub <https://github.com/jaywink>`_
+Jason Robinson / `jasonrobinson.me <https://jasonrobinson.me>`_ / `GitHub <https://github.com/jaywink>`_ / `GitLab <https://git.feneas.org/jaywink>`_
 

federation/__init__.py

@@ -1 +1 @@
-__version__ = "0.17.0-dev"
+__version__ = "0.18.0-dev"

setup.py

@@ -22,8 +22,8 @@ setup(
     author_email='mail@jasonrobinson.me',
     maintainer='Jason Robinson',
     maintainer_email='mail@jasonrobinson.me',
-    url='https://github.com/jaywink/federation',
-    download_url='https://github.com/jaywink/federation/releases',
+    url='https://git.feneas.org/jaywink/federation',
+    download_url='https://pypi.org/project/federation/',
     packages=find_packages(),
     license="BSD 3-clause",
     install_requires=[
@@ -32,7 +32,7 @@ setup(
         "lxml>=3.4.0",
         "ipdata>=2.6",
         "jsonschema>=2.0.0",
-        "pycrypto>=2.6.0",
+        "pycryptodome>=3.4.10",
         "python-dateutil>=2.4.0",
         "python-xrd>=0.1",
         "requests>=2.8.0",