From 100f2017aa64bce18ee83604f22c8586b5e59439 Mon Sep 17 00:00:00 2001
From: David Huss <dh@atoav.com>
Date: Wed, 4 May 2022 16:32:56 +0200
Subject: [PATCH] Add moar words
---
passphrase_generator/__init__.py | 2 +-
passphrase_generator/words.py | 467 ++++++++++++++++++++++++++++++-
poetry.lock | 155 ++++++++++
pyproject.toml | 2 +-
4 files changed, 623 insertions(+), 3 deletions(-)
create mode 100644 poetry.lock
diff --git a/passphrase_generator/__init__.py b/passphrase_generator/__init__.py
index e1dbe6c..a93c316 100755
--- a/passphrase_generator/__init__.py
+++ b/passphrase_generator/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "0.1.4"
+__version__ = '0.1.5'
from .generate import generate_passphrase
diff --git a/passphrase_generator/words.py b/passphrase_generator/words.py
index 3750ed6..ceb559e 100755
--- a/passphrase_generator/words.py
+++ b/passphrase_generator/words.py
@@ -1263,7 +1263,6 @@ DE_ARTWORDS = [
"Punkrock",
"Komponistin",
"Komponist",
- "Assemblage",
"Dadaist",
"Dadaistin",
"Dadaismus",
@@ -1391,6 +1390,472 @@ DE_ARTWORDS = [
"Theoretikerin",
"Theoretikerinnen",
"Hyperrealität",
+ "abstrakt",
+ "Aktmalerei",
+ "Allegorie",
+ "Ideal",
+ "Gestalt",
+ "Alternierend",
+ "Amulett",
+ "Angewandt",
+ "Antike",
+ "Apotheose",
+ "nouveau",
+ "Ästhetik",
+ "Ästhet",
+ "Ästhetiker",
+ "Ästhetikerin",
+ "Attribut",
+ "Avantgarde",
+ "Barock",
+ "Bauhaus",
+ "Beschlagwerk",
+ "Manierismus",
+ "Biedermeier",
+ "Reiter",
+ "Bozetto",
+ "Brücke",
+ "Chiaroscuro",
+ "Konzept",
+ "Konzeptkunst",
+ "Craquelure",
+ "Diptychon",
+ "Divisionismus",
+ "Druckgrafik",
+ "Emulsion",
+ "Expression",
+ "Empirestil",
+ "Farbholzschnitt",
+ "Fauvismus",
+ "Fresco",
+ "Funktionalismus",
+ "funktionalistisch",
+ "Futurismus",
+ "futuristisch",
+ "Futurist",
+ "Futuristin",
+ "Gouache",
+ "Grafitto",
+ "Groteske",
+ "Gummiarabikum",
+ "Historismus",
+ "Ikone",
+ "Ikonographie",
+ "ikonisch",
+ "Illusion",
+ "Illusionistisch",
+ "Impasto",
+ "Intarsie",
+ "Kaltnadel",
+ "Kanon",
+ "Karikatur",
+ "Karton",
+ "Klassik",
+ "Klassizismus",
+ "Komposition",
+ "Konstruktivismus",
+ "Kubismus",
+ "Kunstgewerbe",
+ "Kritik",
+ "Kritiker",
+ "Kritikerin",
+ "Kritikerinnen",
+ "Künstlerkolonie",
+ "Künstlervereinigung",
+ "Lackkunst",
+ "Liberty",
+ "Luminismus",
+ "Metapher",
+ "metaphorisch",
+ "Nachahmer",
+ "Nachahmerin",
+ "Mimikry",
+ "Nachfolger",
+ "naive",
+ "Figuration",
+ "Sachlichkeit",
+ "Offsetdruck",
+ "Ölmaltechnik",
+ "optische Mischung",
+ "Orphismus",
+ "Pastell",
+ "Passepartout",
+ "Pigment",
+ "Pitura",
+ "Lucida",
+ "Pointillismus",
+ "Polyptychon",
+ "Pop",
+ "Portrait",
+ "Primitive",
+ "Primitivo",
+ "Innere-Notwendigkeit",
+ "Realismus",
+ "Realismo",
+ "Realist",
+ "Realistin",
+ "realistisch",
+ "unrealistisch",
+ "Unrealist",
+ "Unrealismus",
+ "Renaissance",
+ "Reproduktion",
+ "Restauration",
+ "Rocaille",
+ "Rollbild",
+ "Romantik",
+ "Schmelzfarbe",
+ "Sfumanto",
+ "Sgraffito",
+ "Staffage",
+ "Stijl",
+ "stilisiert",
+ "Stillleben",
+ "Studie",
+ "Symbolismus",
+ "Symbolist",
+ "Symbolico",
+ "symbolisch",
+ "Anti",
+ "Antisymbolisch",
+ "Unsymbolisch",
+ "Totalismus",
+ "Trompe",
+ "Tuschefleck",
+ "Umkreis",
+ "Veduten",
+ "Verkürzung",
+ "zeichnen",
+ "Akusmatik",
+ "Akustmatiker",
+ "Akusmatikerin",
+ "akusmatisch",
+ "audiowalk",
+ "Blackbox",
+ "Whitebox",
+ "Cloudtank",
+ "Cynetart",
+ "Unlimited",
+ "Hartware",
+ "Interaktion",
+ "Interpassivität",
+ "Monochrom",
+ "Schreibmaschinenkunst",
+ "Soundframe",
+ "Azzuro",
+ "Trägermedium",
+ "Transmediale",
+ "Transmedial",
+ "Assocreation",
+ "Postcommodity",
+ "Postkolonial",
+ "Postmodern",
+ "Postmodernistisch",
+ "Informel",
+ "Documenta",
+ "Dekonstruktivismus",
+ "Techno-Kunst",
+ "Action",
+ "Analytisch",
+ "Kinetik",
+ "kinetisch",
+ "Kinetiker",
+ "Kinetikerin",
+ "Aktion",
+ "Happening",
+ "Windkunst",
+ "Mail-Art",
+ "Tachismus",
+ "Farbfeld",
+ "Generativ",
+ "Drip",
+ "Appropriation",
+ "Prozess",
+ "Seriell",
+ "Signal",
+ "Underground",
+ "Artgeschoß",
+ "Dacapo",
+ "Eat-Art",
+ "Libre",
+ "Liberation",
+ "Open-Source",
+ "Ambient",
+ "Gegenwart",
+ "Individuum",
+ "Information",
+ "Interfunktion",
+ "Junk",
+ "Konkretismus",
+ "Lyrisch",
+ "Lyrik",
+ "Lyriker",
+ "Lyrikerinnen",
+ "Rap",
+ "Rapper",
+ "Rapperin",
+ "Spiel",
+ "Spieler",
+ "Spielerin",
+ "spielen",
+ "Ludens",
+ "Leipzig",
+ "Lichtsicht",
+ "Vorhang",
+ "Feuerwache",
+ "Moskau",
+ "Kiew",
+ "Helsinki",
+ "Stockholm",
+ "Stockhomer",
+ "Wien",
+ "Hamburg",
+ "Hamburger",
+ "Wiener",
+ "Odessa",
+ "Zagrep",
+ "Belgrad",
+ "Rom",
+ "Mailand",
+ "Innsbruck",
+ "München",
+ "Berlin",
+ "Berliner",
+ "Berlinerin",
+ "Dresden",
+ "Stuttgart",
+ "Brüssel",
+ "Gent",
+ "Eindhoven",
+ "Amsterdam",
+ "London",
+ "Manchester",
+ "Madrid",
+ "Barcelona",
+ "Lissabon",
+ "Paris",
+ "Marsailles",
+ "Bern",
+ "Zürich",
+ "Sarajevo",
+ "Warschau",
+ "Warschauer",
+ "Krakau",
+ "Neo",
+ "Neoexpressionismus",
+ "Tendenz",
+ "Tendenzen",
+ "Wilde",
+ "Europa",
+ "Op-Art",
+ "postironisch",
+ "postdramatisch",
+ "psychedelisch",
+ "hyperreal",
+ "Hyperrealismus",
+ "Hyperrealist",
+ "Hyperrealistin",
+ "Foto",
+ "fotorealistisch",
+ "Transavantgarde",
+ "Toyismus",
+ "Blues",
+ "Powwow",
+ "Gospel",
+ "Ragtime",
+ "Soul",
+ "Funk",
+ "Jazz",
+ "Hip-Hop",
+ "Waltzer",
+ "Calypso",
+ "Chutney",
+ "Rapso",
+ "Soca",
+ "Bachata",
+ "Bomba",
+ "Candombe",
+ "Cha-Cha-Cha",
+ "Conga",
+ "Merengue",
+ "Reggaeton",
+ "Cubano",
+ "Zouk",
+ "Bossa-Nova",
+ "Choro",
+ "Conjunto",
+ "Corridos",
+ "Cumbia",
+ "Forro",
+ "Joropo",
+ "Lambada",
+ "Mambo",
+ "Maracatu",
+ "Mariachi",
+ "Murga",
+ "Norteña",
+ "Punta",
+ "Rumba",
+ "Tango",
+ "Samba",
+ "Gnawa",
+ "Chaabi",
+ "Türkü",
+ "Anadolu",
+ "Raga",
+ "Gagaku",
+ "Taiko",
+ "Enka",
+ "Gamelan",
+ "Dangdut",
+ "Mugham",
+ "Joik",
+ "Jig",
+ "Reel",
+ "Strathspey",
+ "Klezmer",
+ "Pijut",
+ "Jodeln",
+ "Flamenco",
+ "Zadschal",
+ "Afro",
+ "Afrobeat",
+ "Austropop",
+ "Beat",
+ "Britpop",
+ "Easy-Listening",
+ "Chiptune",
+ "Minimal",
+ "Synthpop",
+ "Trip-Hop",
+ "J-Pop",
+ "Mandopop",
+ "Mashup",
+ "Darkwave",
+ "Ethereal",
+ "Goth",
+ "Skiffle",
+ "Schlager",
+ "Neurofunk",
+ "Grime",
+ "Dixieland",
+ "Bebop",
+ "Freejazz",
+ "Ska",
+ "Punk",
+ "Raggamuffin",
+ "Dub",
+ "Disco",
+ "Eurotrance",
+ "Italo",
+ "Breakbeat",
+ "Acid",
+ "Chill-Out",
+ "Dubstep",
+ "IDM",
+ "Glitch",
+ "Illbient",
+ "Jungle",
+ "Darkstep",
+ "Drumfunk",
+ "Techstep",
+ "Kwaito",
+ "House",
+ "Industrial",
+ "Postindustrial",
+ "Japanoise",
+ "Noise",
+ "Elektro",
+ "Schranz",
+ "Rave",
+ "Kaput",
+ "Goa",
+ "Dreamhouse",
+ "Hardbass",
+ "Acidcore",
+ "Frenchore",
+ "Gabber",
+ "Gabba",
+ "Hardstyle",
+ "Jumpstyle",
+ "Speedocre",
+ "Terror",
+ "Trancecore",
+ "Barbershop",
+ "Grunge",
+ "Psychobilliy",
+ "Rockabilly",
+ "Shoegazing",
+ "Artrock",
+ "Beatmusik",
+ "Fusion",
+ "Stoner",
+ "Surfabilly",
+ "Anarcho-Punk",
+ "Grindcore",
+ "Metalcore",
+ "Mathcore",
+ "Horrorpunk",
+ "Postpunk",
+ "Sequencer",
+ "Drumcomputer",
+ "808",
+ "909",
+ "707",
+ "606",
+ "Linndrum",
+ "Rosso",
+ "Viola",
+ "Arancione",
+ "Verde",
+ "Marrone",
+ "Blu",
+ "Nero",
+ "Giallo",
+ "Oro",
+ "Grigio",
+ "Bianco",
+ "Argento",
+ "Cioccolato",
+ "Pistacchio",
+ "Stracciatella",
+ "Mandorla",
+ "Limone",
+ "Fragola",
+ "Spumoni",
+ "Venedig",
+ "Venezia",
+ "Kassel",
+ "Bacio",
+ "Napoli",
+ "Neapel",
+ "Sizilien",
+ "Tokio",
+ "Boston",
+ "Denver",
+ "Eiscreme",
+ "Prototyp",
+ "Backup",
+ "Mischpult",
+ "Matrix",
+ "Hacker",
+ "Python",
+ "Render",
+ "Renderer",
+ "Marker",
+ "Sticker",
+ "Poster",
+ "Porno",
+ "Pastise",
+ "Pizza",
+ "Pizzeria",
+ "Sekt",
+ "Prosecco",
+ "Schnaps",
+ "Fatalismus",
+ "Querfront",
+ "Syndikat",
+ "Syndikalismus",
]
EN_ARTWORDS = [
diff --git a/poetry.lock b/poetry.lock
new file mode 100644
index 0000000..7d7df50
--- /dev/null
+++ b/poetry.lock
@@ -0,0 +1,155 @@
+[[package]]
+name = "atomicwrites"
+version = "1.4.0"
+description = "Atomic file writes."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "attrs"
+version = "21.4.0"
+description = "Classes Without Boilerplate"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.extras]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
+docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
+
+[[package]]
+name = "colorama"
+version = "0.4.4"
+description = "Cross-platform colored terminal text."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[[package]]
+name = "more-itertools"
+version = "8.12.0"
+description = "More routines for operating on iterables, beyond itertools"
+category = "dev"
+optional = false
+python-versions = ">=3.5"
+
+[[package]]
+name = "packaging"
+version = "21.3"
+description = "Core utilities for Python packages"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
+
+[[package]]
+name = "pluggy"
+version = "0.13.1"
+description = "plugin and hook calling mechanisms for python"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[package.extras]
+dev = ["pre-commit", "tox"]
+
+[[package]]
+name = "py"
+version = "1.11.0"
+description = "library with cross-python path, ini-parsing, io, code, log facilities"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[[package]]
+name = "pyparsing"
+version = "3.0.8"
+description = "pyparsing module - Classes and methods to define and execute parsing grammars"
+category = "dev"
+optional = false
+python-versions = ">=3.6.8"
+
+[package.extras]
+diagrams = ["railroad-diagrams", "jinja2"]
+
+[[package]]
+name = "pytest"
+version = "5.4.3"
+description = "pytest: simple powerful testing with Python"
+category = "dev"
+optional = false
+python-versions = ">=3.5"
+
+[package.dependencies]
+atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
+attrs = ">=17.4.0"
+colorama = {version = "*", markers = "sys_platform == \"win32\""}
+more-itertools = ">=4.0.0"
+packaging = "*"
+pluggy = ">=0.12,<1.0"
+py = ">=1.5.0"
+wcwidth = "*"
+
+[package.extras]
+checkqa-mypy = ["mypy (==v0.761)"]
+testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
+
+[[package]]
+name = "wcwidth"
+version = "0.2.5"
+description = "Measures the displayed width of unicode strings in a terminal"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[metadata]
+lock-version = "1.1"
+python-versions = "^3.8"
+content-hash = "c27944f25b55067b06883f1cea204be7d97841a4b8228fab69b91895347494ad"
+
+[metadata.files]
+atomicwrites = [
+ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"},
+ {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
+]
+attrs = [
+ {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
+ {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
+]
+colorama = [
+ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
+ {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
+]
+more-itertools = [
+ {file = "more-itertools-8.12.0.tar.gz", hash = "sha256:7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064"},
+ {file = "more_itertools-8.12.0-py3-none-any.whl", hash = "sha256:43e6dd9942dffd72661a2c4ef383ad7da1e6a3e968a927ad7a6083ab410a688b"},
+]
+packaging = [
+ {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
+ {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
+]
+pluggy = [
+ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},
+ {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
+]
+py = [
+ {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
+ {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
+]
+pyparsing = [
+ {file = "pyparsing-3.0.8-py3-none-any.whl", hash = "sha256:ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06"},
+ {file = "pyparsing-3.0.8.tar.gz", hash = "sha256:7bf433498c016c4314268d95df76c81b842a4cb2b276fa3312cfb1e1d85f6954"},
+]
+pytest = [
+ {file = "pytest-5.4.3-py3-none-any.whl", hash = "sha256:5c0db86b698e8f170ba4582a492248919255fcd4c79b1ee64ace34301fb589a1"},
+ {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"},
+]
+wcwidth = [
+ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
+ {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"},
+]
diff --git a/pyproject.toml b/pyproject.toml
index 3eeb923..aba0f89 100755
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "passphrase-generator"
-version = "0.1.4"
+version = "0.1.5"
description = ""
authors = ["David Huss <dh@atoav.com>"]
--
GitLab