Add Swedish dictionary, improvements to setup.py

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 91fbcc13dff23ff5c4a68e8d8a3b88733cb429d4..583679a32f1d3700284a3c65345358b0b5737588 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -41,4 +41,6 @@ Tobias Bora <tobias.bora@gmail.com>
 Andrew Parker <aparker127@gmail.com>
 Sean Abbott <sabbott@cargurus.com>
 David Shen <davidshen84@gmail.com>
-Gregor Dschung <gregor@chkpnt.de>
\ No newline at end of file
+Gregor Dschung <gregor@chkpnt.de>
+Ben Kohler <bkohler@gentoo.org>
+Rikard Nordin <Rikard.Nordin@jordbruksverket.se>
\ No newline at end of file

diff --git a/README.rst b/README.rst
index 0a0de756f0cf9d1714c00ee3dd62a4add1e42217..ca2d179223f2e638e4907f6e36abdf6932a6e81a 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -85,6 +85,7 @@ A concise overview of the available ``xkcdpass`` options can be accessed via::
                                     eff-special, legacy, spa-mich (Spanish), fin-kotus (Finnish)
                                     ita-wiki (Italian), ger-anlx (German), nor-nb (Norwegian),
                                     fr-freelang (French), pt-ipublicis / pt-l33t-ipublicis (Portuguese)
+                                    swe-short (Swedish)
         --min=MIN_LENGTH
                                     Minimum length of words to make password
         --max=MAX_LENGTH
@@ -143,7 +144,8 @@ Additional languages
 - German (eff_large_de_sample.wordlist): based on `this public domain dictionary <https://sourceforge.net/projects/germandict/>`_. Converted to UTF-8 and randomly sampled to reduce file size. 
 - Norwegian: a modified version of `Norsk Ordbank in Norwegian Bokmål 2005 <https://www.nb.no/sprakbanken/show?serial=oai%3Anb.no%3Asbr-5&lang=en>`_, 2018-06-28 update, which is released under the `CC-BY 4.0 license <https://creativecommons.org/licenses/by/4.0/>`_. Regex has been used to alter the list for cleanup and removal of words with impractical characters. The resulting list contains ~137k words.
 - French: One cleaned version of `this list <https://packetstormsecurity.com/files/download/32007/french.gz>`_ (public domain), and one filtered to remove potentially offensive words.
-- Portuguese: Converted variant of the LibreOffice / Firefox poturguese dictionary (from `this link <https://raw.githubusercontent.com/titoBouzout/Dictionaries/master/Portuguese%20(European).dic>`_. GPL and BSD licenced.
+- Portuguese: Converted variant of the LibreOffice / Firefox Portuguese dictionary (from `this link <https://raw.githubusercontent.com/titoBouzout/Dictionaries/master/Portuguese%20(European).dic>`_. GPL and BSD licenced.
+- Swedish: a modified version of `Martin Lindhe's Swedish word list <https://github.com/martinlindhe/wordlist_swedish>` (MIT license). Modifications also released under MIT license.
 
 Additional language word lists are always welcome!
 
@@ -193,6 +195,7 @@ or setting the appropriate environment variable::
 
 Changelog
 =========
+- **1.19.7** Adds Swedish wordlist, improvements to test suite, improvements to setup.py (excludes examples from install) 
 - **1.19.6** Fixes randomly failing unit test
 - **1.19.5** Adds "as-is" option for case
 - **1.19.4** Makes randomised delimiters behavior consistent with fixed delimeters
@@ -211,7 +214,6 @@ Changelog
 - **1.17.0** Add French, Norwegian, and Portuguese dictionaries. Bugfixes and improvements to tests (WIP).
 - **1.16.5** Adds title case option for `--case`
 - **1.16.4** Improve unit tests, fixes broken test on python 2
-- **1.16.3** Correct links for German worldist, updated docs to include the list
 
 License
 =======

diff --git a/setup.py b/setup.py
index 06b646323d4944b6a2330fe0dc71e9220dba45fd..157754aefb0f922773fa05005daa37a4f2744928 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 
 setup(
     name='xkcdpass',
-    version='1.19.6',
+    version='1.19.7',
     author='Steven Tobin',
     author_email='steventtobin@gmail.com',
     url='https://github.com/redacted/XKCD-password-generator',