From a489ef6dcb671c497191bd06c9678933948df7d2 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 14 Nov 2020 19:25:38 -0800 Subject: [PATCH] bump version numbers for release --- CONTRIBUTING.md | 2 +- gooey/__init__.py | 2 +- gooey/gui/components/widgets/options.py | 74 +++++++++++++++++++++++++ requirements.txt | 1 + setup.py | 5 +- 5 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 gooey/gui/components/widgets/options.py diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f28cab4..9ba9235 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ Some Caveats Up Front: * Feedback may take time * Merges may take time -**--> The current release branch is [1.0.6](https://github.com/chriskiehl/Gooey/tree/1.0.6-release) <--**. All PRs should be opened against this branch. +**--> The current release branch is [1.0.7](https://github.com/chriskiehl/Gooey/tree/1.0.7-release) <--**. All PRs should be opened against this branch. ### Getting Started: diff --git a/gooey/__init__.py b/gooey/__init__.py index eab5ee9..e8507c5 100644 --- a/gooey/__init__.py +++ b/gooey/__init__.py @@ -4,4 +4,4 @@ from gooey.python_bindings.gooey_parser import GooeyParser from gooey.gui.util.freeze import localResourcePath as local_resource_path from gooey.python_bindings import constants from gooey.gui.components.filtering.prefix_filter import PrefixTokenizers -__version__ = '1.0.5' +__version__ = '1.0.6' diff --git a/gooey/gui/components/widgets/options.py b/gooey/gui/components/widgets/options.py new file mode 100644 index 0000000..d11ce82 --- /dev/null +++ b/gooey/gui/components/widgets/options.py @@ -0,0 +1,74 @@ +import pygtrie as trie +from fuzzywuzzy import process + +class BasicDisplayOptions(object): + pass + +countries = ["Abkhazia -> Abkhazia", "Afghanistan", + "Albania", "Algeria", "Andorra", "Angola", "Antigua and Barbuda", "Argentina", + "Armenia", "Artsakh -> Artsakh", "Australia", "Austria", "Azerbaijan", "Bahamas, The", + "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bhutan", + "Bolivia", "Bosnia and Herzegovina", "Botswana", "Brazil", "Brunei", "Bulgaria", + "Burkina Faso[j]", "Burma -> Myanmar", "Burundi", "Cambodia", "Cameroon", "Canada[k]", + "Cape Verde", "Central African Republic", "Chad", "Chile", "China", + "China, Republic of -> Taiwan", "Colombia", "Comoros", + "Congo, Democratic Republic of the[p]", "Congo, Republic of the", + "Cook Islands -> Cook Islands", "Costa Rica", "Croatia", "Cuba", "Cyprus", + "Czech Republic[r]", "Democratic People's Republic of Korea -> Korea, North", + "Democratic Republic of the Congo -> Congo, Democratic Republic of the", "Denmark", + "Djibouti", "Dominica", "Dominican Republic", "East Timor", "Ecuador", "Egypt", + "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Eswatini -> Swaziland", + "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Gambia, The", "Georgia", "Germany", + "Ghana", "Greece", "Grenada", "Guatemala", "Guinea", "Guinea", "Guyana", "Haiti", + "Holy See -> Vatican City", "Honduras", "Hungary", "Iceland[v]", "India", "Indonesia", + "Iran", "Iraq", "Ireland", "Israel", "Italy", "Ivory Coast", "Jamaica", "Japan", + "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Korea, North", "Korea, South", + "Kosovo -> Kosovo", "Kuwait", "Kyrgyzstan", "Laos", "Latvia", "Lebanon", "Lesotho", + "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg", "Madagascar", "Malawi", + "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", + "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia", "Montenegro", "Morocco", + "Mozambique", "Myanmar", "Nagorno", "Namibia", "Nauru", "Nepal", "Netherlands", + "New Zealand", "Nicaragua", "Niger", "Nigeria", "Niue -> Niue", + "Northern Cyprus -> Northern Cyprus", "North Korea -> Korea, North", "North Macedonia", + "Norway", "Oman", "Pakistan", "Palau", "Palestine", "Panama", "Papua New Guinea", + "Paraguay", "Peru", "Philippines", "Poland", "Portugal", + "Pridnestrovie -> Transnistria", "Qatar", "Republic of Korea -> Korea, South", + "Republic of the Congo -> Congo, Republic of the", "Romania", "Russia", "Rwanda", + "Sahrawi Arab Democratic Republic -> Sahrawi Arab Democratic Republic", + "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa", + "San Marino", "São Tomé and Príncipe", "Saudi Arabia", "Senegal", "Serbia", + "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", + "Somalia", "Somaliland -> Somaliland", "South Africa", "South Korea -> Korea, South", + "South Ossetia -> South Ossetia", "South Sudan", "Spain", "Sri Lanka", "Sudan", + "Sudan, South -> South Sudan", "Suriname", "Swaziland", "Sweden", "Switzerland", + "Syria", "Taiwan (Republic of China) -> Taiwan", "Tajikistan", "Tanzania", "Thailand", + "The Bahamas -> Bahamas, The", "The Gambia -> Gambia, The", "Timor", "Togo", "Tonga", + "Transnistria -> Transnistria", "Trinidad and Tobago", "Tunisia", "Turkey", + "Turkmenistan", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", + "United Kingdom", "United States", "Uruguay", "Uzbekistan", "Vanuatu", "Vatican City", + "Venezuela", "Vietnam", "Yemen", "Zambia", "Zimbabwe", + "↑ UN member states and observer states ↑", "", "↓ Other states ↓", "Abkhazia", + "Artsakh", "Cook Islands", "Kosovo", "Niue", "Northern Cyprus", + "Sahrawi Arab Democratic Republic", "Somaliland", "South Ossetia", "Taiwan", + "Transnistria", "↑ Other states ↑"] + + +us_states = ["Alabama", "Alaska", "Arizona", "Arkansas", "California", "Colorado", + "Connecticut", "Delaware", "Florida", "Georgia", "Hawaii", "Idaho", "Illinois", + "Indiana", "Iowa", "Kansas", "Kentucky[E]", "Louisiana", "Maine", "Maryland", + "Massachusetts", "Michigan", "Minnesota", "Mississippi", "Missouri", "Montana", + "Nebraska", "Nevada", "New Hampshire", "New Jersey", "New Mexico", "New York", + "North Carolina", "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", + "Rhode Island", "South Carolina", "South Dakota", "Tennessee", "Texas", "Utah", + "Vermont", "Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"] + +x = trie.Trie() +output = {} +for country in countries: + for i in country.split(): + if not x.has_key(i): + x[i] = [] + x[i].append(country) + + +a = 10 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 0e71166..5fd7612 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ wxpython>=4.1.0 Pillow>=4.3.0 psutil>=5.4.2 colored>=1.3.93 +pygtrie>=2.3.3 diff --git a/setup.py b/setup.py index 9072549..4f59d26 100644 --- a/setup.py +++ b/setup.py @@ -6,12 +6,13 @@ from setuptools import setup, find_packages with open('README.md') as readme: long_description = readme.read() -version = '1.0.5' +version = '1.0.6' deps = [ 'Pillow>=4.3.0', 'psutil>=5.4.2', - 'colored>=1.3.93' + 'colored>=1.3.93', + 'pygtrie>=2.3.3' ] if sys.version[0] == '3':