Install edx-user-state-client from PyPI, move xblock-review.

requirements/edx/base.txt

@@ -65,6 +65,7 @@ edx-proctoring==1.3.7
 edx-rest-api-client==1.7.1
 edx-search==1.1.0
 edx-submissions==2.0.12
+edx-user-state-client==1.0.3
 edxval==0.1.10
 event-tracking==0.2.4
 feedparser==5.1.3
@@ -129,6 +130,9 @@ django-webpack-loader==0.4.1
 pyuca==1.1
 zendesk==1.1.1
 
+# XBlocks
+xblock-review==1.1.4
+
 # lxml is also in requirements/edx-sandbox/post.txt
 lxml==3.8.0
 

requirements/edx/github.txt

@@ -4,6 +4,12 @@
 #   * @edx/ospr - to check licensing
 #   * @edx/devops - to check system requirements
 #
+# Do *NOT* install Python packages from GitHub unless it's absolutely necessary!
+# "I don't have time to add automatic Travis upload to PyPI." is *not* an
+# acceptable excuse. Non-wheel module installations slow down the dev/building process.
+# Travis/PyPI instructions are here:
+# https://openedx.atlassian.net/wiki/spaces/OpenOPS/pages/41911049/Publishing+a+Package+to+PyPI+using+Travis
+#
 # A correct GitHub reference looks like this:
 #
 #   git+https://github.com/OWNER/REPO-NAME.git@TAG-OR-SHA#egg=DIST-NAME==VERSION
@@ -93,10 +99,7 @@ git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd3
 -e git+https://github.com/edx/DoneXBlock.git@01a14f3bd80ae47dd08cdbbe2f88f3eb88d00fba#egg=done-xblock
 git+https://github.com/edx/xblock-utils.git@v1.0.5#egg=xblock-utils==1.0.5
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
-git+https://github.com/edx/edx-user-state-client.git@1.0.2#egg=edx-user-state-client==1.0.2
 git+https://github.com/edx/xblock-lti-consumer.git@v1.1.7#egg=lti_consumer-xblock==1.1.7
-# This is here because all of the other XBlocks are located here. However, it is published to PyPI and will be installed that way
-xblock-review==1.1.4
 
 # Third Party XBlocks