Merge branch 'feature/py39' into develop

requirements38.txt

@@ -8,8 +8,16 @@ argon2-cffi-bindings==21.2.0
 arrow==1.0.2
 asgiref==3.4.1
 asn1crypto==0.24.0
+<<<<<<< HEAD
 atomicwrites==1.3.0
 attrs==19.1.0
+=======
+astroid==2.11.7
+async-generator==1.10
+atomicwrites==1.3.0
+attrs==21.4.0
+autopep8==1.6.0
+>>>>>>> feature/py39
 Babel==2.9.1
 backcall==0.1.0
 backports.zoneinfo==0.2.1
@@ -27,7 +35,11 @@ celery==5.2.1
 certifi==2019.3.9
 cffi==1.14.0
 chardet==3.0.4
+<<<<<<< HEAD
 charset-normalizer==2.0.9
+=======
+charset-normalizer==2.1.0
+>>>>>>> feature/py39
 click==8.0.3
 click-didyoumean==0.3.0
 click-plugins==1.1.1
@@ -35,10 +47,18 @@ click-repl==0.2.0
 cloudpickle==1.2.2
 colorama==0.4.1
 colorclass==2.2.0
+<<<<<<< HEAD
+=======
+contourpy==1.0.6
+>>>>>>> feature/py39
 cookies==2.2.1
 coreapi==2.3.3
 coreschema==0.0.4
 coverage==5.5
+<<<<<<< HEAD
+=======
+cramjam==2.5.0
+>>>>>>> feature/py39
 cryptography==3.4.7
 cycler==0.10.0
 Cython==0.29.21
@@ -46,6 +66,10 @@ dask==2021.12.0
 decorator==4.4.0
 defusedxml==0.5.0
 Deprecated==1.2.13
+<<<<<<< HEAD
+=======
+dill==0.3.5.1
+>>>>>>> feature/py39
 Django==3.2.12
 django-analytical==2.5.0
 django-async-messages==0.3.1
@@ -54,10 +78,18 @@ django-classy-tags==0.8.0
 django-cookie-law==2.0.1
 django-cors-headers==3.10.1
 django-countries==7.2.1
+<<<<<<< HEAD
 django-datetime-widget==0.9.3
 django-datetime-widget2==0.9.5
 django-debug-toolbar==2.0
 django-extensions==2.1.6
+=======
+django-crispy-forms==1.14.0
+django-datetime-widget2==0.9.5
+django-debug-toolbar==2.0
+django-extensions==2.1.6
+django-filter==22.1
+>>>>>>> feature/py39
 django-htmlmin==0.11.0
 django-leaflet==0.28.2
 django-oauth-toolkit==1.2.0
@@ -82,8 +114,14 @@ execnet==1.5.0
 factory-boy==2.11.1
 Faker==1.0.4
 fastjsonschema==2.16.1
+<<<<<<< HEAD
 fastparquet==0.5.0
 fitparse==1.2.0
+=======
+fastparquet==0.8.3
+fitparse==1.2.0
+flake8==4.0.1
+>>>>>>> feature/py39
 Flask==1.0.2
 fonttools==4.28.2
 fsspec==2021.11.1
@@ -94,6 +132,10 @@ geos==0.2.1
 grpcio==1.26.0
 grpcio-tools==1.26.0
 gunicorn==20.0.4
+<<<<<<< HEAD
+=======
+h11==0.13.0
+>>>>>>> feature/py39
 holoviews==1.13.5
 html5lib==1.1
 htmlmin==0.1.12
@@ -112,6 +154,10 @@ ipython-genutils==0.2.0
 ipywidgets==7.4.2
 iso8601==0.1.12
 isodate==0.6.0
+<<<<<<< HEAD
+=======
+isort==5.10.1
+>>>>>>> feature/py39
 itsdangerous==1.1.0
 itypes==1.2.0
 jedi==0.18.0
@@ -132,18 +178,31 @@ jwcrypto==1.0
 keyring==18.0.0
 kiwisolver==1.0.1
 kombu==5.2.2
+<<<<<<< HEAD
 llvmlite==0.36.0
+=======
+lazy-object-proxy==1.7.1
+llvmlite==0.39.1
+>>>>>>> feature/py39
 locket==0.2.1
 lxml==4.7.1
 Markdown==3.0.1
 MarkupSafe==2.0.1
 matplotlib==3.5.0
 maxminddb==1.5.4
+<<<<<<< HEAD
 minify
 MiniMockTest==0.5
 mistune==2.0.4
 mock==2.0.0
 more-itertools==6.0.0
+=======
+mccabe==0.6.1
+MiniMockTest==0.5
+mistune==2.0.4
+mock==2.0.0
+more-itertools==8.12.0
+>>>>>>> feature/py39
 mpld3==0.3
 mysqlclient==1.4.2.post1
 nbclassic==0.3.4
@@ -155,12 +214,20 @@ newrelic==8.1.0.180
 nose==1.3.7
 nose-parameterized==0.6.0
 notebook==6.4.6
+<<<<<<< HEAD
 numba==0.53.1
 numpy==1.18.5
+=======
+numba==0.56.2
+>>>>>>> feature/py39
 oauth2==1.9.0.post1
 oauth2-provider==0.0
 oauthlib==3.0.1
 openapi-codec==1.3.2
+<<<<<<< HEAD
+=======
+outcome==1.2.0
+>>>>>>> feature/py39
 packaging==21.3
 pandas==1.2.4
 pandocfilters==1.4.2
@@ -176,23 +243,46 @@ pexpect==4.6.0
 pickleshare==0.7.5
 Pillow==8.4.0
 pip-upgrader==1.4.6
+<<<<<<< HEAD
 pluggy==0.9.0
 prometheus-client==0.6.0
 prompt-toolkit==2.0.9
 protobuf==3.11.1
+=======
+platformdirs==2.5.2
+pluggy==0.9.0
+ply==3.11
+prometheus-client==0.6.0
+prompt-toolkit==2.0.9
+protobuf==3.19.4
+>>>>>>> feature/py39
 psycopg2==2.8.1
 ptyprocess==0.6.0
 py==1.11.0
 pyarrow==2.0.0
 pycairo==1.19.0
+<<<<<<< HEAD
 pycparser==2.19
 pyct==0.4.8
 Pygments==2.13.0
 PyJWT==2.1.0
+=======
+pycodestyle==2.8.0
+pycparser==2.19
+pyct==0.4.8
+pyflakes==2.4.0
+Pygments==2.13.0
+PyJWT==2.1.0
+pylint==2.14.4
+>>>>>>> feature/py39
 pyOpenSSL==20.0.1
 pyparsing==3.0.6
 pyrsistent==0.14.11
 pyshp==2.1.0
+<<<<<<< HEAD
+=======
+PySocks==1.7.1
+>>>>>>> feature/py39
 pytest==4.3.1
 pytest-django==3.4.8
 pytest-forked==1.0.2
@@ -207,22 +297,40 @@ pytzdata==2020.1
 pyviz-comms==0.7.6
 pywin32-ctypes==0.2.0
 PyYAML==6.0
+<<<<<<< HEAD
 pyzmq
+=======
+pyzmq==18.0.1
+>>>>>>> feature/py39
 qtconsole==4.4.3
 ratelim==0.1.6
 rauth==0.7.3
 redis==3.5.3
+<<<<<<< HEAD
 requests==2.23.0
+=======
+requests==2.28.1
+>>>>>>> feature/py39
 requests-oauthlib==1.2.0
 rowingdata==3.5.29
 rowingphysics==0.5.0
 rq==1.10.1
+<<<<<<< HEAD
 rules==3.0
+=======
+ruamel.yaml==0.17.21
+ruamel.yaml.clib==0.2.6
+rules==3.3
+>>>>>>> feature/py39
 ruptures==1.1.3
 s3transfer==0.3.4
 safety==1.10.3
 scipy==1.5.4
 SecretStorage==3.3.1
+<<<<<<< HEAD
+=======
+selenium==4.3.0
+>>>>>>> feature/py39
 Send2Trash==1.8.0
 setuptools-scm==6.3.2
 shell==1.0.1
@@ -230,30 +338,56 @@ shortuuid==0.5.0
 simplejson==3.17.2
 six==1.12.0
 sniffio==1.2.0
+<<<<<<< HEAD
+=======
+sortedcontainers==2.4.0
+>>>>>>> feature/py39
 soupsieve==1.8
 SQLAlchemy==1.3.1
 sqlparse==0.3.0
 stravalib==0.10.4
+<<<<<<< HEAD
+=======
+TatSu==5.6.1
+tblib==1.7.0
+>>>>>>> feature/py39
 termcolor==1.1.0
 terminado==0.12.1
 terminaltables==3.1.0
 testpath==0.4.2
 text-unidecode==1.2
 thrift==0.15.0
+<<<<<<< HEAD
+=======
+thriftpy2==0.4.14
+>>>>>>> feature/py39
 timezonefinder==5.2.0
 tinycss2==1.1.1
 tk==0.1.0
 toml==0.10.2
 tomli==1.2.2
+<<<<<<< HEAD
+=======
+tomlkit==0.11.1
+>>>>>>> feature/py39
 toolz==0.10.0
 tornado==6.1
 tqdm==4.31.1
 traitlets==5.4.0
+<<<<<<< HEAD
+=======
+trio==0.21.0
+trio-websocket==0.9.2
+>>>>>>> feature/py39
 trueskill==0.4.5
 typing_extensions==4.0.1
 units==0.7
 uritemplate==3.0.0
+<<<<<<< HEAD
 urllib3==1.25.9
+=======
+urllib3==1.26.10
+>>>>>>> feature/py39
 VerbalExpressions==0.0.2
 vine==5.0.0
 wcwidth==0.1.7
@@ -262,9 +396,18 @@ websocket-client==1.2.3
 Werkzeug==0.15.1
 widgetsnbextension==3.4.2
 wrapt==1.13.3
+<<<<<<< HEAD
 xlrd==1.2.0
 xmltodict==0.12.0
 yamjam==0.1.7
 yamllint==1.15.0
 yuicompressor
+=======
+wsproto==1.1.0
+xlrd==1.2.0
+xmltodict==0.12.0
+xyzservices==2022.9.0
+yamjam==0.1.7
+yamllint==1.15.0
+>>>>>>> feature/py39
 zipp==3.8.1