Merge branch 'master' into 'dev'

Master

See merge request alpha/physical!4

requirements.txt

-alpha-types==0.0.61
-amqp==2.3.2
-asn1crypto==0.24.0
-backcall==0.1.0
-billiard==3.5.0.4
-cached-property==1.5.1
-celery==4.2.0
-certifi==2018.10.15
-cffi==1.11.5
-chardet==3.0.4
-confluent-kafka==0.11.6
-contextlib2==0.5.5
-cryptography==2.4.2
-decorator==4.3.0
 Django==1.8
+kafka-python>=1.2.1,<1.4
 elasticsearch==6.3.1
-falcon==1.1.0
-gevent==1.3.7
-gm-config==0.1.3
-gm-logging==0.8.0
-gm-protocol==7.6.33
-gm-rpcd==0.2.3
-gm-tracer==0.1.2
-gm-types==7.70.394
-gm-upload==0.0.73
-greenlet==0.4.15
-gunicorn==19.9.0
-helios==0.6.3
-idna==2.7
-ipython==7.2.0
-ipython-genutils==0.2.0
-jedi==0.13.1
-jsonschema==2.6.0
-kafka-python==1.3.5
-kombu==4.2.1
-monotonic==1.5
-msgpack-python==0.4.8
-mysqlclient==1.3.13
-parso==0.3.1
-pexpect==4.6.0
-pickleshare==0.7.5
-prompt-toolkit==2.0.7
-protobuf==3.6.0
-psutil==5.4.8
-ptyprocess==0.6.0
-pycparser==2.19
-Pygments==2.3.0
-PyMySQL==0.9.2
-python-mimeparse==1.6.0
-pytz==2018.7
-PyYAML==3.11
-qiniu==7.1.4
-raven==5.32.0
+
 redis==2.10.6
+celery==4.2.0
 redlock==1.2.0
-requests==2.20.1
-six==1.11.0
-traitlets==4.3.2
-urllib3==1.24.1
-verlib==0.1
-vine==1.1.4
-wcwidth==0.1.7
-wrapt==1.10.11
+
+PyMySQL==0.9.2
+
+gunicorn==19.9.0
+gevent==1.3.7
+
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@master
+git+ssh://git@git.wanmeizhensuo.com/backend/helios.git@master
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@master
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-config.git@v0.1.3#egg=gm-config==0.1.3
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-protocol.git@master
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-upload.git@master
+git+ssh://git@git.wanmeizhensuo.com/system/gm-tracer.git@v0.1.2
+git+ssh://git@git.wanmeizhensuo.com/alpha/alpha-types.git@dev
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-types.git@master
\ No newline at end of file