Merge pull request openedx-unsupported#2926 from edx/feanil/pywatchman

feanil · web-flow · commit 4bd3bf8fd0f4 · 2020-04-29T13:45:52.000-04:00
Switch from pyinotify to pywatchman for filemonitoring.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -19,15 +19,15 @@ cffi==1.14.0              # via cryptography
 chardet==3.0.4            # via requests
 coreapi==2.3.3            # via -r requirements/base.in, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via coreapi
-cryptography==2.9         # via pyopenssl, social-auth-core
+cryptography==2.9.2       # via pyopenssl, social-auth-core
 cssselect==1.1.0          # via premailer
 cssutils==1.0.2           # via premailer
 defusedxml==0.6.0         # via python3-openid, social-auth-core, zeep
 git+https://github.com/django-compressor/django-appconf.git@5169ce2c92d9836e0b3ab3ec645727d9d5225d1a#egg=django-appconf  # via -r requirements/base.in, django-compressor
 django-compressor==2.4    # via -r requirements/base.in, django-libsass
 django-cors-headers==3.2.1  # via -r requirements/base.in
 django-crispy-forms==1.8.1  # via -r requirements/base.in
-django-crum==0.7.5        # via edx-rbac
+django-crum==0.7.6        # via edx-rbac
 django-extensions==2.2.9  # via -r requirements/base.in
 django-extra-views==0.11.0  # via django-oscar
 django-filter==2.2.0      # via -r requirements/base.in
@@ -37,7 +37,7 @@ django-model-utils==3.2.0  # via edx-rbac
 django-oscar==2.0.4       # via -r requirements/base.in
 django-phonenumber-field==2.0.1  # via django-oscar
 django-rest-swagger==2.2.0  # via -r requirements/base.in
-django-simple-history==2.8.0  # via -r requirements/base.in
+django-simple-history==2.10.0  # via -r requirements/base.in
 django-solo==1.1.3        # via -r requirements/base.in
 django-tables2==1.21.2    # via django-oscar
 django-threadlocals==0.10  # via -r requirements/base.in
@@ -64,7 +64,7 @@ faker==4.0.3              # via factory-boy
 future==0.18.2            # via pyjwkest
 idna==2.9                 # via requests
 isodate==0.6.0            # via zeep
-itypes==1.1.0             # via coreapi
+itypes==1.2.0             # via coreapi
 jinja2==2.11.2            # via coreschema
 jsonfield2==3.0.3         # via -c requirements/pins.txt, -r requirements/base.in
 kombu==3.0.37             # via celery
@@ -80,8 +80,8 @@ openapi-codec==1.3.2      # via django-rest-swagger
 path.py==7.2              # via -r requirements/base.in
 paypalrestsdk==1.13.1     # via -r requirements/base.in
 pbr==5.4.5                # via stevedore
-phonenumbers==8.12.1      # via django-oscar, django-phonenumber-field
-pillow==7.1.1             # via django-oscar
+phonenumbers==8.12.2      # via django-oscar, django-phonenumber-field
+pillow==7.1.2             # via django-oscar
 premailer==2.9.2          # via -r requirements/base.in
 psutil==1.2.1             # via edx-django-utils
 purl==1.5                 # via django-oscar
@@ -119,7 +119,7 @@ stripe==1.70.0            # via -r requirements/base.in
 text-unidecode==1.3       # via faker
 unicodecsv==0.14.1        # via -r requirements/base.in, djangorestframework-csv
 uritemplate==3.0.1        # via coreapi
-urllib3==1.25.8           # via -c requirements/pins.txt, requests
+urllib3==1.25.9           # via -c requirements/pins.txt, requests
 webencodings==0.5.1       # via bleach
 xss-utils==0.1.2          # via -r requirements/base.in
 zeep==3.4.0               # via -r requirements/base.in
diff --git a/requirements/dev.in b/requirements/dev.in
@@ -10,4 +10,4 @@ transifex-client
 ptvsd
 
 # For devserver code reloading
-pyinotify==0.9.6 # This breaks OSX virtualenv installation
+pywatchman
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -24,7 +24,7 @@ chardet==3.0.4            # via -r requirements/docs.txt, -r requirements/test.t
 coreapi==2.3.3            # via -r requirements/test.txt, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via -r requirements/test.txt, coreapi
 coverage==5.1             # via -r requirements/test.txt, pytest-cov
-cryptography==2.9         # via -r requirements/test.txt, pyopenssl, social-auth-core
+cryptography==2.9.2       # via -r requirements/test.txt, pyopenssl, social-auth-core
 cssselect==1.1.0          # via -r requirements/test.txt, premailer
 cssutils==1.0.2           # via -r requirements/test.txt, premailer
 ddt==1.3.1                # via -r requirements/test.txt
@@ -34,7 +34,7 @@ git+https://github.com/django-compressor/django-appconf.git@5169ce2c92d9836e0b3a
 django-compressor==2.4    # via -r requirements/test.txt, django-libsass
 django-cors-headers==3.2.1  # via -r requirements/test.txt
 django-crispy-forms==1.8.1  # via -r requirements/test.txt
-django-crum==0.7.5        # via -r requirements/test.txt, edx-rbac
+django-crum==0.7.6        # via -r requirements/test.txt, edx-rbac
 django-debug-toolbar==2.2  # via -r requirements/dev.in
 django-extensions==2.2.9  # via -r requirements/test.txt
 django-extra-views==0.11.0  # via -r requirements/test.txt, django-oscar
@@ -45,7 +45,7 @@ django-model-utils==3.2.0  # via -r requirements/test.txt, edx-rbac
 django-oscar==2.0.4       # via -r requirements/test.txt
 django-phonenumber-field==2.0.1  # via -r requirements/test.txt, django-oscar
 django-rest-swagger==2.2.0  # via -r requirements/test.txt
-django-simple-history==2.8.0  # via -r requirements/test.txt
+django-simple-history==2.10.0  # via -r requirements/test.txt
 django-solo==1.1.3        # via -r requirements/test.txt
 django-tables2==1.21.2    # via -r requirements/test.txt, django-oscar
 django-threadlocals==0.10  # via -r requirements/test.txt
@@ -83,7 +83,7 @@ importlib-metadata==1.6.0  # via -r requirements/test.txt, inflect, pluggy, pyte
 inflect==3.0.2            # via -r requirements/test.txt, jinja2-pluralize
 isodate==0.6.0            # via -r requirements/test.txt, zeep
 isort==4.3.21             # via -r requirements/test.txt, pylint
-itypes==1.1.0             # via -r requirements/test.txt, coreapi
+itypes==1.2.0             # via -r requirements/test.txt, coreapi
 jinja2-pluralize==0.3.0   # via -r requirements/test.txt, diff-cover
 jinja2==2.11.2            # via -r requirements/docs.txt, -r requirements/test.txt, coreschema, diff-cover, jinja2-pluralize, sphinx
 jsonfield2==3.0.3         # via -r requirements/test.txt
@@ -108,8 +108,8 @@ path.py==7.2              # via -r requirements/test.txt, edx-i18n-tools
 pathlib2==2.3.5           # via -r requirements/test.txt, pytest
 paypalrestsdk==1.13.1     # via -r requirements/test.txt
 pbr==5.4.5                # via -r requirements/test.txt, stevedore
-phonenumbers==8.12.1      # via -r requirements/test.txt, django-oscar, django-phonenumber-field
-pillow==7.1.1             # via -r requirements/test.txt, django-oscar
+phonenumbers==8.12.2      # via -r requirements/test.txt, django-oscar, django-phonenumber-field
+pillow==7.1.2             # via -r requirements/test.txt, django-oscar
 pluggy==0.13.1            # via -r requirements/test.txt, diff-cover, pytest, tox
 polib==1.1.0              # via -r requirements/test.txt, edx-i18n-tools
 premailer==2.9.2          # via -r requirements/test.txt
@@ -123,7 +123,6 @@ pycountry==17.1.8         # via -r requirements/test.txt
 pycparser==2.20           # via -r requirements/test.txt, cffi
 pycryptodomex==3.9.7      # via -r requirements/test.txt, pyjwkest
 pygments==2.6.1           # via -r requirements/docs.txt, -r requirements/test.txt, diff-cover, sphinx
-pyinotify==0.9.6          # via -r requirements/dev.in
 pyjwkest==1.4.2           # via -r requirements/test.txt, edx-drf-extensions
 pyjwt==1.7.1              # via -r requirements/test.txt, drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
 pylint==2.4.4             # via -r requirements/test.txt
@@ -136,23 +135,24 @@ pytest-django-ordering==1.2.0  # via -r requirements/test.txt
 pytest-django==3.9.0      # via -r requirements/test.txt, pytest-django-ordering
 pytest-html==1.22.1       # via -r requirements/test.txt, pytest-selenium
 pytest-metadata==1.8.0    # via -r requirements/test.txt, pytest-html
-pytest-randomly==3.2.1    # via -r requirements/test.txt
+pytest-randomly==3.3.1    # via -r requirements/test.txt
 pytest-selenium==1.17.0   # via -r requirements/test.txt
 pytest-timeout==1.3.4     # via -r requirements/test.txt
 pytest-variables==1.9.0   # via -r requirements/test.txt, pytest-selenium
 pytest==5.3.5             # via -r requirements/test.txt, pytest-base-url, pytest-cov, pytest-django, pytest-django-ordering, pytest-html, pytest-metadata, pytest-randomly, pytest-selenium, pytest-timeout, pytest-variables
 python-dateutil==2.8.1    # via -r requirements/test.txt, analytics-python, edx-drf-extensions, faker, freezegun
-python-dotenv==0.12.0     # via -r requirements/test.txt
+python-dotenv==0.13.0     # via -r requirements/test.txt
 python-memcached==1.58    # via -r requirements/test.txt
 python-slugify==1.2.6     # via transifex-client
 python3-openid==3.1.0     # via -r requirements/test.txt, social-auth-core
 pytz==2016.10             # via -r requirements/docs.txt, -r requirements/test.txt, babel, celery, django, zeep
+pywatchman==1.4.1         # via -r requirements/dev.in
 pyyaml==5.3.1             # via -r requirements/test.txt, edx-django-release-util, edx-i18n-tools
 rcssmin==1.0.6            # via -r requirements/test.txt, django-compressor
 requests-oauthlib==1.3.0  # via -r requirements/test.txt, social-auth-core
 requests-toolbelt==0.9.1  # via -r requirements/test.txt, zeep
 requests==2.23.0          # via -r requirements/docs.txt, -r requirements/test.txt, analytics-python, coreapi, edx-drf-extensions, edx-rest-api-client, paypalrestsdk, pyjwkest, pytest-base-url, pytest-selenium, requests-oauthlib, requests-toolbelt, responses, sailthru-client, slumber, social-auth-core, sphinx, stripe, transifex-client, zeep
-responses==0.10.12        # via -r requirements/test.txt
+responses==0.10.14        # via -r requirements/test.txt
 rest-condition==1.0.3     # via -r requirements/test.txt, edx-drf-extensions
 rjsmin==1.1.0             # via -r requirements/test.txt, django-compressor
 rules==2.2                # via -r requirements/test.txt
@@ -171,7 +171,7 @@ sphinx==1.5.3             # via -r requirements/docs.txt, edx-sphinx-theme
 sqlparse==0.3.1           # via -r requirements/test.txt, django, django-debug-toolbar
 stevedore==1.32.0         # via -r requirements/test.txt, edx-opaque-keys
 stripe==1.70.0            # via -r requirements/test.txt
-testfixtures==6.14.0      # via -r requirements/test.txt
+testfixtures==6.14.1      # via -r requirements/test.txt
 text-unidecode==1.3       # via -r requirements/test.txt, faker
 toml==0.10.0              # via -r requirements/test.txt, tox
 tox-battery==0.5.2        # via -r requirements/test.txt
@@ -181,13 +181,13 @@ typed-ast==1.4.1          # via -r requirements/test.txt, astroid
 unicodecsv==0.14.1        # via -r requirements/test.txt, djangorestframework-csv
 unidecode==1.1.1          # via python-slugify
 uritemplate==3.0.1        # via -r requirements/test.txt, coreapi
-urllib3==1.25.8           # via -r requirements/docs.txt, -r requirements/test.txt, requests, selenium, transifex-client
+urllib3==1.25.9           # via -r requirements/docs.txt, -r requirements/test.txt, requests, selenium, transifex-client
 virtualenv==16.7.9        # via -r requirements/test.txt, tox
 waitress==1.4.3           # via -r requirements/test.txt, webtest
 wcwidth==0.1.9            # via -r requirements/test.txt, pytest
 webencodings==0.5.1       # via -r requirements/test.txt, bleach
 webob==1.8.6              # via -r requirements/test.txt, webtest
-webtest==2.0.34           # via -r requirements/test.txt, django-webtest
+webtest==2.0.35           # via -r requirements/test.txt, django-webtest
 wrapt==1.11.2             # via -r requirements/test.txt, astroid
 xss-utils==0.1.2          # via -r requirements/test.txt
 zeep==3.4.0               # via -r requirements/test.txt
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -20,4 +20,4 @@ requests==2.23.0          # via sphinx
 six==1.14.0               # via edx-sphinx-theme, sphinx
 snowballstemmer==2.0.0    # via sphinx
 sphinx==1.5.3             # via -r requirements/docs.in, edx-sphinx-theme
-urllib3==1.25.8           # via -c requirements/pins.txt, requests
+urllib3==1.25.9           # via -c requirements/pins.txt, requests
diff --git a/requirements/e2e.txt b/requirements/e2e.txt
@@ -20,16 +20,16 @@ pyparsing==2.4.7          # via packaging
 pytest-base-url==1.4.1    # via pytest-selenium
 pytest-html==1.22.1       # via pytest-selenium
 pytest-metadata==1.8.0    # via pytest-html
-pytest-randomly==3.2.1    # via -r requirements/e2e.in
+pytest-randomly==3.3.1    # via -r requirements/e2e.in
 pytest-selenium==1.17.0   # via -r requirements/e2e.in
 pytest-timeout==1.3.4     # via -r requirements/e2e.in
 pytest-variables==1.9.0   # via pytest-selenium
 pytest==5.3.5             # via -c requirements/pins.txt, -r requirements/e2e.in, pytest-base-url, pytest-html, pytest-metadata, pytest-randomly, pytest-selenium, pytest-timeout, pytest-variables
-python-dotenv==0.12.0     # via -r requirements/e2e.in
+python-dotenv==0.13.0     # via -r requirements/e2e.in
 requests==2.23.0          # via edx-rest-api-client, pytest-base-url, pytest-selenium, slumber
 selenium==3.141.0         # via -r requirements/e2e.in, pytest-selenium
 six==1.14.0               # via packaging, pathlib2
 slumber==0.7.1            # via edx-rest-api-client
-urllib3==1.25.8           # via -c requirements/pins.txt, requests, selenium
+urllib3==1.25.9           # via -c requirements/pins.txt, requests, selenium
 wcwidth==0.1.9            # via pytest
 zipp==1.2.0               # via importlib-metadata
diff --git a/requirements/pins.txt b/requirements/pins.txt
@@ -31,3 +31,12 @@ urllib3>=1.24.2,<2.0.0
 
 # Was causing some tox issues locally.
 virtualenv==16.7.9
+
+# newer version seems to be causing failures
+# if tox -e py35-django22-pylint passes after
+# removing this pin, then this pin can be removed.
+pylint==2.4.4
+
+# See https://openedx.atlassian.net/browse/ARCHBOM-1141 for details.
+# need an update in configuration before this can be removed.
+pip-tools<5.0.0
diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt
@@ -4,6 +4,6 @@
 #
 #    make upgrade
 #
-click==7.1.1              # via pip-tools
-pip-tools==4.5.1          # via -r requirements/pip_tools.in
+click==7.1.2              # via pip-tools
+pip-tools==4.5.1          # via -c requirements/pins.txt, -r requirements/pip_tools.in
 six==1.14.0               # via pip-tools
diff --git a/requirements/production.txt b/requirements/production.txt
@@ -20,15 +20,15 @@ cffi==1.14.0              # via cryptography
 chardet==3.0.4            # via requests
 coreapi==2.3.3            # via -r requirements/base.in, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via coreapi
-cryptography==2.9         # via pyopenssl, social-auth-core
+cryptography==2.9.2       # via pyopenssl, social-auth-core
 cssselect==1.1.0          # via premailer
 cssutils==1.0.2           # via premailer
 defusedxml==0.6.0         # via python3-openid, social-auth-core, zeep
 git+https://github.com/django-compressor/django-appconf.git@5169ce2c92d9836e0b3ab3ec645727d9d5225d1a#egg=django-appconf  # via -r requirements/base.in, django-compressor
 django-compressor==2.4    # via -r requirements/base.in, django-libsass
 django-cors-headers==3.2.1  # via -r requirements/base.in
 django-crispy-forms==1.8.1  # via -r requirements/base.in
-django-crum==0.7.5        # via edx-rbac
+django-crum==0.7.6        # via edx-rbac
 django-extensions==2.2.9  # via -r requirements/base.in
 django-extra-views==0.11.0  # via django-oscar
 django-filter==2.2.0      # via -r requirements/base.in
@@ -39,7 +39,7 @@ django-oscar==2.0.4       # via -r requirements/base.in
 django-phonenumber-field==2.0.1  # via django-oscar
 django-rest-swagger==2.2.0  # via -r requirements/base.in
 django-ses==0.8.2         # via -r requirements/production.in
-django-simple-history==2.8.0  # via -r requirements/base.in
+django-simple-history==2.10.0  # via -r requirements/base.in
 django-solo==1.1.3        # via -r requirements/base.in
 django-tables2==1.21.2    # via django-oscar
 django-threadlocals==0.10  # via -r requirements/base.in
@@ -67,7 +67,7 @@ future==0.18.2            # via pyjwkest
 gunicorn==19.7.1          # via -r requirements/production.in
 idna==2.9                 # via requests
 isodate==0.6.0            # via zeep
-itypes==1.1.0             # via coreapi
+itypes==1.2.0             # via coreapi
 jinja2==2.11.2            # via coreschema
 jsonfield2==3.0.3         # via -c requirements/pins.txt, -r requirements/base.in
 kombu==3.0.37             # via celery
@@ -84,8 +84,8 @@ openapi-codec==1.3.2      # via django-rest-swagger
 path.py==7.2              # via -r requirements/base.in
 paypalrestsdk==1.13.1     # via -r requirements/base.in
 pbr==5.4.5                # via stevedore
-phonenumbers==8.12.1      # via django-oscar, django-phonenumber-field
-pillow==7.1.1             # via django-oscar
+phonenumbers==8.12.2      # via django-oscar, django-phonenumber-field
+pillow==7.1.2             # via django-oscar
 premailer==2.9.2          # via -r requirements/base.in
 psutil==1.2.1             # via edx-django-utils
 purl==1.5                 # via django-oscar
@@ -125,7 +125,7 @@ stripe==1.70.0            # via -r requirements/base.in
 text-unidecode==1.3       # via faker
 unicodecsv==0.14.1        # via -r requirements/base.in, djangorestframework-csv
 uritemplate==3.0.1        # via coreapi
-urllib3==1.25.8           # via -c requirements/pins.txt, requests
+urllib3==1.25.9           # via -c requirements/pins.txt, requests
 webencodings==0.5.1       # via bleach
 xss-utils==0.1.2          # via -r requirements/base.in
 zeep==3.4.0               # via -r requirements/base.in
diff --git a/requirements/test.txt b/requirements/test.txt

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`#`
`5`	`5`	`# make upgrade`
`6`	`6`	`#`
`7`		`-click==7.1.1 # via pip-tools`
`8`		`-pip-tools==4.5.1 # via -r requirements/pip_tools.in`
	`7`	`+click==7.1.2 # via pip-tools`
	`8`	`+pip-tools==4.5.1 # via -c requirements/pins.txt, -r requirements/pip_tools.in`
`9`	`9`	`six==1.14.0 # via pip-tools`