Py36 (#192)

Py36 Upgrade

Author: HenryMehta

.ebextensions/01_packages.config

@@ -4,7 +4,7 @@ packages:
     postgresql93-devel: []
     libxslt-devel: []
     libxml2-devel: []
-    python27-devel: []
+    python36: []
     gcc-c++: []
     gcc-gfortran: []
     atlas-sse3-devel: []

.gitignore

@@ -21,3 +21,5 @@ webcdi/media/*
 env/
 __pycache__/
 .vscode/
+
+static/

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "python.pythonPath": "env/bin/python2.7"
+    "python.pythonPath": "env/bin/python"
 }

requirements.txt

@@ -1,75 +1,79 @@
-app-version==0.2.1
+app-version==1.0.1
 appdirs==1.4.3
-awsebcli==3.14.1
-backports.ssl-match-hostname==3.5.0.1
-bleach==2.1.3
-blessed==1.14.2
-botocore==1.7.7
+awsebcli==3.15.3
+backports.ssl-match-hostname==3.7.0.1
+beautifulsoup4==4.8.0
+bleach==3.1.0
+blessed==1.15.0
+botocore==1.12.241
 cached-property==1.5.1
 cement==2.8.2
-certifi==2019.6.16
+certifi==2019.9.11
 chardet==3.0.4
 colorama==0.3.9
-Django==1.11.5
+confusable-homoglyphs==3.2.0
+Django==2.2.6
 django-adaptors==0.2.5
-django-appconf==1.0.2
-django-axes==2.3.3
-django-bootstrap3==9.0.0
+django-appconf==1.0.3
+django-axes==5.0.14
+django-bootstrap3==11.1.0
 django-bootstrap3-datetimepicker==2.2.3
-django-bootstrap4==0.0.3
+django-bootstrap4==1.0.1
 django-ckeditor==5.7.1
-django-countries==5.3.1
-git+git://github.com/django-crispy-forms/django-crispy-forms.git@c243b01a41ff2cab28fba219f39f996c1125195d
-#django-crispy-forms==1.7.2
-django-csvimport==2.4
+django-countries==5.5
+django-crispy-forms==1.7.2
+django-csvimport==2.13
 django-form-utils==1.0.3
-django-health-check==3.5.1
-django-inspectional-registration==0.6.2
-django-ipware==1.1.6
+django-health-check==3.11.0
+#django-inspectional-registration==0.6.2
+git+git://github.com/HenryMehta/django-inspectional-registration.git
+django-ipware==2.1.0
 django-js-asset==1.2.2
-django-localflavor==2.0
-django-modeltranslation==0.12.2
-django-tables2==1.10.0
+django-localflavor==2.2
+django-modeltranslation==0.13.3
+django-tables2==2.1.1
 docker==3.7.3
-docker-compose==1.21.2
-docker-py==1.10.6
+docker-compose==1.23.2
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
-docutils==0.14
-enum34==1.1.6
-functools32==3.2.3.post2
-futures==3.2.0
-html5lib==0.999999999
-idna==2.8
+docutils==0.15.2
+enum-compat==0.0.2
+future==0.16.0
+futures==3.1.1
+html5lib==1.0.1
+idna==2.7
 ipaddress==1.0.22
-jmespath==0.9.3
+jmespath==0.9.4
 json-table-schema==0.2.1
 jsonschema==2.6.0
-lxml==3.8.0
-Markdown==2.6.11
+lxml==4.4.1
+Markdown==3.1.1
 messytables==0.15.2
-numpy==1.13.1
-packaging==16.8
-pandas==0.20.3
-pathspec==0.5.5
-Pillow==6.1.0
-psycopg2==2.7.3.1
-pyparsing==2.2.0
-python-dateutil==2.6.1
-python-magic==0.4.13
-pytz==2017.2
-PyYAML==3.12
-requests==2.22.0
-selenium==3.5.0
+numpy==1.17.2
+packaging==19.2
+pandas==0.25.1
+pathspec==0.5.9
+Pillow==6.2.0
+psycopg2==2.8.3
+pyparsing==2.4.2
+python-dateutil==2.8.0
+python-magic==0.4.15
+python-stdnum==1.11
+pytz==2019.2
+PyYAML==3.13
+requests==2.20.1
+selenium==3.141.0
 semantic-version==2.5.0
 six==1.11.0
-tabulate==0.7.5
+soupsieve==1.9.4
+sqlparse==0.3.0
+tabulate==0.8.5
 termcolor==1.1.0
 texttable==0.9.1
 tolerance==0.1.2
-urllib3==1.25.3
+urllib3==1.24.3
 wcwidth==0.1.7
 webencodings==0.5.1
-websocket-client==0.44.0
-xlrd==1.1.0
+websocket-client==0.56.0
+xlrd==1.2.0

webcdi/.gitignore

@@ -327,7 +327,7 @@ item_325,beach,word,places,produces,beach,beach,,
 item_326,camping,word,places,produces,camping,camping,,
 item_327,church,word,places,produces,church*,church*,,
 item_328,circus,word,places,produces,circus,circus,,
-item_329,country,word,places,produces,country,country (word),,
+item_329,country_word,word,places,produces,country,country (word),,
 item_330,downtown,word,places,produces,downtown,downtown,,
 item_331,farm,word,places,produces,farm,farm,,
 item_332,gas_station,word,places,produces,gas station,gas station,,

webcdi/cdi_form_csv/[English_WS].csv

@@ -0,0 +1 @@
+[{"model": "cdi_forms.choices", "pk": 1, "fields": {"choice_set": "produces", "choice_set_en": "produces", "choice_set_es": "produce", "choice_set_fr_ca": "dit", "choice_set_en_ca": "produces", "choice_set_nl": "produceert"}}, {"model": "cdi_forms.choices", "pk": 2, "fields": {"choice_set": "not yet; sometimes; often", "choice_set_en": "not yet; sometimes; often", "choice_set_es": "todav\u00eda no; de vez en cuando; frecuentemente", "choice_set_fr_ca": "pas encore; parfois; souvent", "choice_set_en_ca": "not yet; sometimes; often", "choice_set_nl": "nog niet; soms; vaak "}}, {"model": "cdi_forms.choices", "pk": 3, "fields": {"choice_set": "simple; complex", "choice_set_en": "simple; complex", "choice_set_es": "simple; complex", "choice_set_fr_ca": "simple; complex", "choice_set_en_ca": "simple; complex", "choice_set_nl": " eenvoudig; complex"}}, {"model": "cdi_forms.choices", "pk": 4, "fields": {"choice_set": "no; yes", "choice_set_en": "no; yes", "choice_set_es": "no; s\u00ed", "choice_set_fr_ca": "non; oui", "choice_set_en_ca": " no; yes", "choice_set_nl": " nee; ja"}}, {"model": "cdi_forms.choices", "pk": 5, "fields": {"choice_set": "understands", "choice_set_en": "understands", "choice_set_es": "comprende", "choice_set_fr_ca": "comprend", "choice_set_en_ca": "understands", "choice_set_nl": " begrijpt"}}, {"model": "cdi_forms.choices", "pk": 6, "fields": {"choice_set": "never; sometimes; often", "choice_set_en": "never; sometimes; often", "choice_set_es": "todav\u00eda no; de vez en cuando; frecuentemente", "choice_set_fr_ca": "jamais; parfois; souvent", "choice_set_en_ca": "never; sometimes; often", "choice_set_nl": " nooit; soms; vaak"}}, {"model": "cdi_forms.choices", "pk": 7, "fields": {"choice_set": "understands; produces", "choice_set_en": "understands; produces", "choice_set_es": "comprende; produce", "choice_set_fr_ca": "comprend; dit", "choice_set_en_ca": "understands; produces", "choice_set_nl": " begrijpt; produceert"}}, {"model": "cdi_forms.choices", "pk": 8, "fields": {"choice_set": "pronoun; article", "choice_set_en": "pronoun; article", "choice_set_es": "", "choice_set_fr_ca": "pronoun; article", "choice_set_en_ca": " pronoun; article", "choice_set_nl": " voornaamwoord; artikel"}}]

webcdi/cdi_forms/fixtures/choices.json

@@ -59,8 +59,8 @@
           "field":"birth_order"
       },
       {
-          "field":"multiple_birth_boolean",
-          "div":["multiple_birth"]
+          "field":"multi_birth_boolean",
+          "div":["multi_birth"]
       }    
       ]
 },{

webcdi/cdi_forms/fixtures/items.json

@@ -59,8 +59,8 @@
           "field":"birth_order"
       },
       {
-          "field":"multiple_birth_boolean",
-          "div":["multiple_birth"]
+          "field":"multi_birth_boolean",
+          "div":["multi_birth"]
       }    
       ]
 },{