Fix conflicts.

.coveragerc

@@ -0,0 +1,10 @@
+[run]
+include =
+    scripts/*.py
+    tests/*.py
+    www/*.py
+
+[report]
+exclude_lines =
+    pragma: no cover
+    if __name__ == '__main__':

.gitignore

@@ -3,13 +3,14 @@ backups
 data
 logs
 misc
-realestate/static/pictures
+www/static/pictures
 tests/data
 tests/misc
 
 # Files
 scripts/phantomjs
 scripts/ngrok
+scripts/wires
 
 *.Python
 *.txt
@@ -20,5 +21,3 @@ scripts/ngrok
 *.bmml
 *.csv
 *.out
-
-fabfile.py

.travis.yml

@@ -1,15 +1,14 @@
 language: python
 sudo: false
 python:
-- '2.7'
+- '3.5'
 install:
 - pip install -r requirements.txt
-before_script:
-- export PYTHONPATH=$PYTHONPATH:$(pwd)
+script:
 - mkdir logs
 - touch logs/realestate.log
-script:
-- coverage run tests/test*.py
+- nosetests tests --with-coverage
+- tox
 after_success:
 - coveralls
 deploy:
@@ -18,23 +17,8 @@ deploy:
   secret_access_key:
     secure: Dh/dAklShJFyeh8jMTMe05BM20r///zb66k6f1VbwN26OrbWV1V6p4Ue83N1jTpFvBFc2C/XTHi/r42jRJU5H+zlJBc3Rwsly7aqHPXxee207Zi3Kgo62cqaZSLV4mnNlineFAkdjM82OhV1TKnT843F5L6gaSPJJHVRtz5Vrbk=
   bucket: lensnola
-  local-dir: realestate/static
+  local-dir: www/static
   upload-dir: realestate
   acl: public_read
   on:
     repo: TheLens/realestate
-env:
-  global:
-  - secure: B43D3wsqZ/+a/1OA6T0Cqevr96bUs3iqqMilZNyiZnwjdu+j2qKQ0JFMhiaUDvnSW41xhkQR00Yi5q6G1rWJ95eM67k/hFVCabIo0nbqKgHVtTOvofV443al9svZW70gaKFdWfHmwizaGFEshdddoUd/Q4Ic30mNiL3/yiGZ9fk=
-  - secure: jEGWFRamEnNgYHUFgMXapDq2uyE8oBUrfbo/G/wQlzGAdOrZwdMd2fxdJ9QgNrGT91C1Wn+oYGM1yVUMP1A+u/4znS4h9uvu7XuDpjaJ0DkptcELuFo+LNNM+q8V7E9vu8EnVyNVpZm2nxRXHHE82pObWSCZ8JoQAFUAoru0cso=
-  - secure: u2u6Acr+P2Acjipu2E6BUP/ApkhEFXOFlxn7L/tbR1U1zh7sdce4FsK8oJM92XQzofe003n+liPiPSMi/gdVoxlW6r8XQ/HVQ/9ghJyZMV/H1M88B8Vn4Ql3THKODyJESITgnHM9gtUbXKdGxEqSLO/EJXaDw2GKKfLdMTb8ENM=
-  - secure: HxaMVE5UJhdLJRMvp0kHq4RTYMv3jLTBqGZZCCUcRfwGKDIo/ReBDyU4BpqMOD0iKkYljT1Z1lfllYq446qHHpTDTK+CgfqFq8Wly9PquaWbR8OxD7LbPs83B5NdyLvViMspheW7mqEyyEttXvoG2JhQjdq7LAUaVvypC1Zuf7I=
-  - secure: nqHuQttTrZE9tTfMN8kq69YOwDRIWnCspSCcgJshLFnPqKgRb9dKVsh6LbsQBlkyU4KoSBOr5JHKQrd8fZ4MCSKl8fSDHrlw5ras1AaUlFvqRHLW5GHJw/rctY9sLrvNVroa1qV7SUNtLHSWo4FHu97C1OEhDkqQ4vMrqHFoxSc=
-  - secure: qiAzbRqyI4lx7OaMkAzCLKczJruVnOYqj2t9vbWMojwxWYBXe+WEVknrS50cAq0Cf3gvMrBFL7roNtGmf9Q8YUlyYcMEI2ZyJQWI8JSC7+EztKXKmPGbvUHd144IplT7nQSNLgkxgEfo6zQsrZYloeZZLmo4FTwRRAUpPBJ/Srk=
-  - secure: EbEABi1NpNV3Uj4wpZ0S//d1n5DFQJQXHp2Po/aqzt5eoFI1Ox0BtSe6RZSaw2DDWbayfMuX61L4kiEX1m9ln9rENCp6xPxOKZOa4pgMjxRXax7m5aWRbXb1DxBUwf7ez+WHP+tnIMZUD9axZlxsfQmyeJowx4lgTzbtuN0qFBM=
-  - secure: WpmIBdrctRpFXwH5wAeSIt1jjlzGLzQ4xK67P2htdq5oJ318tJIN2nOMCMEkyeB/xiyK95c8C/40IHYNfzg69b68rBiVZwOQ+e6O9fkP0rJlHAQeCg7kAw5IBfvNfVtRHi7q+Yp0MGYXRVZg1x+5g4Z1lGJGst4JtpvXhTGoj+Q=
-  - secure: peQZ/79gBOnPqG0UZ62enI+Ny823uion0V3bOyGKlqeypXcA7VyMM2AKGr/F5Yz4wyDH1Ayt3eEY7KNm2Ud44R/FpGvJ5h+Wr1GxHnmVFtLewSyLHHB+qS6AHKPsmKzJr48z9OGlDuhYhUACoV3qL61lMRSq/DKGEWvUaSVBrJ0=
-  - secure: g33NRFXX+QZ+33RJWFhAB5DKrhN0xokH51TS7THYVxdAmXtT9FTnjpg8BWjt8jFslIeFele6yskw1mZ+GaCbCswo/u/Mj6ph+1dNc0uJ81NWL5jTh+vNhkRG/DVuxFMZajHQ+PT+ntYpGsb7hkA0u4bURnakn30NKFUt2fZSEH8=
-  - secure: TB6eW60s2F4a2HP4rackGgxPUIgdpucSRAJj6c6WERWdUysB2T75/VzKQE3JvYG+L5IKfl60C5hcxdERjPIC5bhIG+Xyo5OV9x5fuYPIgPqsoC0TZqImOn0hUZZAqyrtN8GF91sIIT26UbBbYtYE2RfNJ3nnDB596QSVrKkS8Js=
-  - secure: IHSrXacYVRnqTqJSKQQIwWfGHD/XYXNH0547V2i/AeM7nK3fdU5xLBoe9+rDWB+tWlB7UiIqqlKUw3erx6VmD8iIxw458mCY/EeYnOJK63AWKldPw41/z0+IUnzyahtOoYNlH9t08x75OVRyCkhrtfAujKUDkO4HSJti56Inbdk=
-  - secure: sLpFpxbiQAxFwcu/PUoJfYv0qVqHpUHU8KY2qeCfDLbcCSnk5R0u/B0VQKckqplwrd26Myfksqu8OqBuUUk/0fjqFyxplSMpbAPf7fjsCmeIDBM8F1DGANEFP75fhysXwP5cI0N+4mN82pNWuEvXp2OGNF2x/n/AnxghneUO7gk=

README.md

@@ -24,15 +24,15 @@ This app scrapes the latest property sales in New Orleans, stores the records in
 Every day, these two commands are run to scrape and then build, geocode, clean and publish the previous day's sales. These are summarized in `scripts/main.sh`, which is run on a cron job every night.
 
 ```bash
-python realestate/lib/scrape.py
+python scripts/scrape.py
 python scripts/initialize.py
 ```
 
 Occasionally, due to bugs or password expiration, you will need to scrape and build beyond the previous day. You can specify the date range for both commands by using command-line arguments.
 
 ```bash
 # <starting_date> <ending_date>
-python realestate/lib/scrape.py 2016-05-01 2016-05-05
+python scripts/scrape.py 2016-05-01 2016-05-05
 python scripts/initialize.py 2016-05-01 2016-05-05
 ```
 
@@ -53,3 +53,37 @@ export REAL_ESTATE_LRD_PASSWORD='MyLandRecordsDivisionPassword'
 export REAL_ESTATE_DATABASE_USERNAME='MyDatabaseUsername'
 export REAL_ESTATE_DATABASE_PASSWORD='MyDatabasePassword'
 ```
+
+#### Tests
+
+```bash
+nosetests
+```
+
+```bash
+tox
+```
+
+Run the app using Python 3. Set this up when creating the virtual environment. This is because OpenSSL/urllib3 has security flaws in older versions.
+
+```bash
+mkvirtualenv TODO realestate
+```
+
+Run `nosetests tests` in the app's top-level directory. To show code coverage as well, run `nosetests tests --with-coverage`.
+
+__Different Python versions__
+
+The app uses `tox` for testing different Python versions. The app is compatible and tested for Python 2.7 and 3.5. The basic usage:
+
+```bash
+tox
+```
+
+You may need to first run `unset PYTHONPATH`.
+
+You can also run specific Python version tests like this:
+
+```bash
+tox -e py35
+```

confs/app.ini

@@ -1,22 +1,25 @@
 [uwsgi]
+master = true
+workers = 2
+harakiri = 60
+max-requests = 100
+socket = 127.0.0.1:5004
+
 virtualenv = /home/ubuntu/.virtualenvs/realestate
 chdir = /home/ubuntu/realestate
 for-readline = /home/ubuntu/.virtualenvs/realestate/bin/postactivate
   env = %(_)
-endfor = 
+endfor =
 for-readline = /home/ubuntu/.virtualenvs/postactivate
   env = %(_)
-endfor = 
-wsgi-file = realestate/app.py
+endfor =
+wsgi-file = www/app.py
 callable = app
-touch-reload = /home/ubuntu/realestate/realestate/app.py
-socket = 127.0.0.1:5004
+touch-reload = /home/ubuntu/realestate/www/app.py
 logto = /var/log/uwsgi/realestate.log
+log-maxsize = 10500000
 uid = ubuntu
 gid = ubuntu
-die-on-term
-catch-exceptions
-workers = 2
-harakiri = 120
-max-requests = 200
-master
+die-on-term = true
+catch-exceptions = true
+vacuum = true

confs/realestate.conf

@@ -1,6 +1,7 @@
+description "uWSGI instance to serve realestate app."
+
 start on runlevel [2345]
 stop on runlevel [!2345]
-
 respawn
 
 script

crontab

@@ -0,0 +1,3 @@
+# Real estate
+*/5 * * * * cd /home/ubuntu/realestate && git fetch origin master && git reset --hard FETCH_HEAD  # Sync with GitHub master branch
+0 3 * * * /home/ubuntu/realestate/scripts/main.sh  # Scrapes and builds yesterday's sales

docs/contracts.rst

@@ -0,0 +1,16 @@
+.. _contracts:
+
+Contracts
+=========
+
+.. automodule:: contracts.app
+    :members:
+
+.. automodule:: contracts.db
+    :members:
+
+.. automodule:: contracts.models
+    :members:
+
+.. automodule:: contracts.views
+    :members:

docs/misc.rst

@@ -12,32 +12,32 @@ Misc.
 .. automodule:: realestate.views
     :members:
 
-.. automodule:: realestate.lib.delete_dates
+.. automodule:: scripts.delete_dates
     :members:
 
-.. automodule:: realestate.lib.email_template
+.. automodule:: scripts.email_template
     :members:
 
-.. automodule:: realestate.lib.form_tweet
+.. automodule:: scripts.form_tweet
     :members:
 
-.. automodule:: realestate.lib.get_dates
+.. automodule:: scripts.get_dates
     :members:
 
-.. automodule:: realestate.lib.libraries
+.. automodule:: scripts.libraries
     :members:
 
-.. automodule:: realestate.lib.mail
+.. automodule:: scripts.mail
     :members:
 
-.. automodule:: realestate.lib.results_language
+.. automodule:: scripts.results_language
     :members:
 
-.. automodule:: realestate.lib.stat_analysis
+.. automodule:: scripts.stat_analysis
     :members:
 
-.. automodule:: realestate.lib.twitter
+.. automodule:: scripts.twitter
     :members:
 
-.. automodule:: realestate.lib.utils
+.. automodule:: scripts.utils
     :members: