# HG changeset patch
# User drewp@bigasterisk.com
# Date 2019-05-21 23:37:26
# Node ID 55e41b61b4720aa0907188875097b58f3efc34b4
# Parent  a2407582cef0ba44656b83542456a7d3b6cb6091

python 3 upgrade starts: makefile and requirements pull py3 pkgs (with some pkg updates)
Ignore-this: 29661f1a805befbd53ac306f241004dc

diff --git a/makefile b/makefile
--- a/makefile
+++ b/makefile
@@ -1,13 +1,12 @@
 ### setup ###
 
 packages:
-	sudo aptitude install coffeescript normalize-audio audacity python-pygame libffi-dev tix libzmq3-dev python-dev libssl-dev python-opencv python-cairo npm git python-virtualenv nginx-full python-tk
+	sudo aptitude install coffeescript normalize-audio audacity python3-pygame libffi-dev tix libzmq3-dev python3-dev libssl-dev python3-opencv python3-cairo npm git python3-virtualenv nginx-full python3-tk
 
 gst_packages:
-	sudo aptitude install python-gi gir1.2-gst-plugins-base-1.0 libgirepository-1.0-1 gir1.2-gstreamer-1.0 gstreamer1.0-tools gstreamer1.0-plugins-good gstreamer1.0-pulseaudio python-gst-1.0 python-pygoocanvas gir1.2-goocanvas-2.0
+	sudo aptitude install python3-gi gir1.2-gst-plugins-base-1.0 libgirepository-1.0-1 gir1.2-gstreamer-1.0 gstreamer1.0-tools gstreamer1.0-plugins-good gstreamer1.0-pulseaudio python3-gst-1.0 gir1.2-goocanvas-2.0
 
-PYTHON=/usr/bin/pypy
-PYTHON=/usr/bin/python
+PYTHON=/usr/bin/python3
 
 create_virtualenv:
 	mkdir -p env
@@ -15,29 +14,8 @@ create_virtualenv:
 	env/bin/pip install -U pip
 	ln -sf ../env/bin/python bin/python
 
-
-install_python_deps: link_to_sys_packages
-	env/bin/pip install twisted
-	env/bin/pip install -U -r requirements.txt
-
-DP=/usr/lib/python2.7/dist-packages
-SP=env/lib/python2.7/site-packages
-
-link_to_sys_packages:
-	# http://stackoverflow.com/questions/249283/virtualenv-on-ubuntu-with-no-site-packages
-	ln -sf $(DP)/glib $(SP)/
-	ln -sf $(DP)/gi $(SP)/
-	ln -sf $(DP)/gobject $(SP)/
-	ln -sf $(DP)/cairo $(SP)/
-	ln -sf $(DP)/gtk-2.0 $(SP)/
-	ln -sf $(DP)/pygtk.py $(SP)/
-	ln -sf $(DP)/pygtk.pth $(SP)/
-	ln -sf $(DP)/pygst.pth $(SP)/
-	ln -sf $(DP)/pygst.py $(SP)/
-	ln -sf $(DP)/gst-0.10 $(SP)/
-	ln -sf $(DP)/goocanvasmodule.so $(SP)/
-	ln -sf $(DP)/cv2.x86_64-linux-gnu.so $(SP)/
-	ln -sf $(DP)/cv.py $(SP)/
+install_python_deps:
+	env/bin/pip install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -U -r requirements.txt
 
 binexec:
 	chmod a+x bin/*
@@ -67,21 +45,16 @@ tkdnd_build:
 	./configure
 	make
 
-env-mypy/bin/mypy:
-	mkdir -p env-mypy
-	virtualenv -p /usr/bin/python3  env-mypy/
-	env-mypy/bin/pip install mypy==0.590 lxml==4.2.1
-
 ### build ###
 
 coffee:
 	zsh -c 'cd light9/web; ../../node_modules/coffeescript/bin/coffee --map -cw {.,live,timeline,paint,effects}/*.coffee'
 
-mypy-collector: env-mypy/bin/mypy
-	env-mypy/bin/mypy --py2 --ignore-missing-imports --strict-optional --custom-typeshed-dir stubs --html-report /tmp/rep bin/collector light9/collector/*.py
+mypy-collector:
+	env/bin/mypy --ignore-missing-imports --strict-optional --custom-typeshed-dir stubs --html-report /tmp/rep bin/collector light9/collector/*.py
 
-mypy-paint: env-mypy/bin/mypy
-	env-mypy/bin/mypy --py2 --ignore-missing-imports --strict-optional --custom-typeshed-dir stubs --html-report /tmp/rep light9/paint/*.py
+mypy-paint:
+	env/bin/mypy --ignore-missing-imports --strict-optional --custom-typeshed-dir stubs --html-report /tmp/rep light9/paint/*.py
 
 ### show ###
 
@@ -92,11 +65,11 @@ darcs_show_checkpoint:
 ### pi setup ###
 
 raspberry_pi_packages:
-	sudo apt-get install python-picamera python-dev python-twisted python-virtualenv
+	sudo apt-get install python3-picamera python3-dev python3-twisted python3-virtualenv
 
 raspberry_pi_virtualenv:
 	mkdir -p env_pi
-	virtualenv --system-site-packages env_pi
+	virtualenv -p /usr/bin/python3 --system-site-packages env_pi
 	env_pi/bin/pip install cyclone 'coloredlogs==6.0'
 
 ### arduino build ###
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,36 +1,39 @@
+Pillow==4.0.0
+Twisted==19.2.0
 coloredlogs==6.0
 colormath==3.0.0
 coverage==4.3.4
-cyclone==1.1
-faulthandler==2.6
 freezegun==0.3.8
 genshi==0.7
-git+http://github.com/drewp/scales.git@448d59fb491b7631877528e7695a93553bfaaa93#egg=scales
 ipdb==0.10.2
 ipython==5.3.0
 klein==17.2.0
-Louie==1.1
 mock==2.0.0
+mypy==0.701
 noise==1.2.2
 nose-watcher==0.1.3
 nose==1.3.7
-Pillow==4.0.0
 pyjade==4.0.0
 pyserial==3.3
 python-dateutil==2.6.0
 pyusb==1.0.0
 rdflib==4.2.2
-restkit==4.2.2
-scipy==0.19.0
-service_identity==16.0.0
+requests==2.22.0
+scipy==1.3.0
+service_identity==18.1.0
 statprof==0.1.2
 toposort==1.5
-treq==17.3.1
-Twisted==17.1.0
-txosc==0.2.0
+treq==18.6.0
 txzmq==0.8.0
 typing==3.6.1
 watchdog==0.8.3
-web.py==0.38
 webcolors==1.7
-https://projects.bigasterisk.com/rdfdb/rdfdb-0.5.0.tar.gz
+
+git+http://github.com/drewp/scales.git@448d59fb491b7631877528e7695a93553bfaaa93#egg=scales
+git+http://github.com/11craft/louie.git@f18bb71010c114eca9c6b88c96453340e3b39454#egg=louie
+git+http://github.com/webpy/webpy@ace0f8954c28311004b33c7a513c6e40a3c02470#egg=web
+https://github.com/drewp/cyclone/archive/python3.zip#egg=cyclone
+
+rdfdb==0.8.0
+
+