requirements: Replace py3_dev.txt with dev_lock.txt.

docs/dev-setup-non-vagrant.md

@@ -311,7 +311,7 @@ sudo virtualenv /srv/zulip-py3-venv -p python3 # Create a python3 virtualenv
 sudo chown -R `whoami`:`whoami` /srv/zulip-py3-venv
 source /srv/zulip-py3-venv/bin/activate # Activate python3 virtualenv
 pip install --upgrade pip # upgrade pip itself because older versions have known issues
-pip install --no-deps -r requirements/py3_dev.txt # install python packages required for development
+pip install --no-deps -r requirements/dev_lock.txt # install python packages required for development
 ```
 
 Now run these commands:

requirements/README.md

@@ -1,23 +1,17 @@
 The dependency graph of the requirements is as follows:
 
 ```
-py3_dev          py3_prod
+dev           py3_prod
-+  + +              +
++ +              +
-|  | +->py3_common<-+
+| +->py3_common<-+
-|  |    |   +
+|     |
-| dev   |   v
+|     v
-|  |    |py3_socialauth
+|   emailmirror,py3_socialauth
-|  |    |
-|  |    |
-|  |    |
-|  v    +---------->emailmirror
-|  docs,py3k
-|
 v
-mypy
+mypy,docs,py3k
 ```
 
-Of the files, only py3_dev, py3_prod, and mypy have been used in the install
+Of the files, only dev, py3_prod, and mypy have been used in the install
 scripts directly. The rest are implicit dependencies.
 
 py3_common and dev locked.

requirements/dev.txt

@@ -44,3 +44,5 @@ scandir==1.5
 # Needed for updating the locked pip dependencies
 first==2.0.1
 pip-tools==1.9.0
+
+-r mypy.txt

requirements/dev_lock.txt

@@ -6,6 +6,7 @@
 #
 git+https://github.com/sharmaeklavya2/PyAPNs.git@remove-simplejson#egg=apns==2.0.1
 git+https://github.com/umairwaheed/fakeldap.git@37bc199e9589c31f4bb5bae1445ad1cd7f84e1ac#egg=fakeldap==0.5.1.0zulip1
+git+https://github.com/python/mypy.git@ad323e25ac68153b18997475430b3abca066bbfc#egg=mypy==0.530-dev
 git+https://github.com/rafaelmartins/pyoembed.git@eb9901917c2a44b49e2887c077ead84a722c50dc#egg=pyoembed
 git+https://github.com/umairwaheed/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.11
 git+https://github.com/umairwaheed/virtualenv-clone.git@short-version#egg=virtualenv-clone==0.2.6
@@ -142,6 +143,7 @@ tornado==4.5.1
 traitlets==4.3.2          # via ipython
 transifex-client==0.12.4
 twisted==17.5.0
+typed-ast==1.1.0
 typing==3.6.2
 ujson==1.35
 uritemplate==3.0.0

requirements/py3_dev.txt

@@ -1,2 +0,0 @@
--r dev_lock.txt
--r mypy.txt

tools/diagnose

@@ -107,7 +107,7 @@ def check_venv():
     # type: () -> bool
     path = os.path.join(ROOT_DIR, 'scripts', 'lib', 'hash_reqs.py')
     cache_dir = '/srv/zulip-venv-cache/'
-    for fn in ['py3_dev.txt']:
+    for fn in ['dev_lock.txt']:
         requirements_file = os.path.join(ROOT_DIR, "requirements", fn)
         output = subprocess.check_output([path, requirements_file], universal_newlines=True)
         sha1sum = output.split()[0]

tools/setup/setup_venvs.py

@@ -14,7 +14,7 @@ from scripts.lib.zulip_tools import run
 OLD_VENV_PATH = "/srv/zulip-venv"
 VENV_PATH = "/srv/zulip-py3-venv"
 
-DEV_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "py3_dev.txt")
+DEV_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "dev_lock.txt")
 
 def main(is_travis=False):
     # type: (bool) -> None

tools/update-locked-requirements

@@ -10,8 +10,12 @@ fi
 
 source /srv/zulip-py3-venv/bin/activate # Activate python3 virtualenv
 pip-compile --output-file requirements/py3_common_lock.txt requirements/py3_common.txt
+# Add the editable flag to mypy for the purpose of building the lockfile for
+# dev.txt
+sed -i 's/git/-e git/' requirements/mypy.txt
 pip-compile --output-file requirements/dev_lock.txt requirements/dev.txt
 # Remove the editable flag in the lock file for safer build
+sed -i 's/-e git/git/' requirements/mypy.txt
 sed -i 's/-e //' requirements/py3_common_lock.txt
 sed -i 's/-e //' requirements/dev_lock.txt
 # pip-tools bug; future, futures are obsolete in python3