Merge branch 'master' of https://github.com/OpenTrons/opentrons-api

Author: Kadee80

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: python
 python:
-- '3.4'
+- '3.5'
 before_install:
 - openssl aes-256-cbc -K $encrypted_f176ff9ac49f_key -iv $encrypted_f176ff9ac49f_iv -in .pypirc.enc -out $HOME/.pypirc -d
 install:

appveyor.yml

@@ -6,8 +6,8 @@ environment:
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
 
   matrix:
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4.x" # currently 3.4.3
+    - PYTHON: "C:\\Python35-x64"
+      PYTHON_VERSION: "3.5.x" # currently 3.4.3
       PYTHON_ARCH: "64"
 
     - PYTHON: "C:\\Python35-x64"

conda.recipe/meta.yaml

@@ -17,13 +17,17 @@ source:
 
 requirements:
   build:
+    - dill
     - python
-    - setuptools
     - pyserial
+    - requests
+    - setuptools
 
   run:
+    - dill
     - python
     - pyserial
+    - requests
 
 test:
   # Python imports

docs/source/conf.py

@@ -147,7 +147,7 @@
     'github_user': 'OpenTrons',
     'github_repo': 'opentrons-api',
     'github_button': 'True',
-    'analytics_id': 'UA-83820700-1',
+    # 'analytics_id': 'UA-83820700-1',
     'description': 'Simple Biology Lab Protocol Coding',
     'link': '#006FFF',
     'link_hover': '#05C1B3',

docs/source/img/labware_lib/Tuberack-0.75ml.png renamed to docs/source/img/labware_lib/Tuberack-075ml.png

@@ -96,7 +96,7 @@ tube-rack-.75ml
 
 **Accessing Tubes:** *single channel* ``[‘A1’]-[‘D6’]``
 
-..image:: img/labware_lib/Tuberack-0.75ml.png
+.. image:: img/labware_lib/Tuberack-075ml.png
 
 
 tube-rack-2ml 
@@ -116,7 +116,7 @@ rack that holds 6 15 mL tubes and 4 50 mL tubes
 
 **Accessing Tubes:** *single channel* ``[‘A1’]-[‘A3’], [‘B1’]-[‘B3’], [‘C1’]-[‘C2’], [‘D1’]-[‘D2’]``
 
-..image:: img/labware_lib/Tuberack-15-50ml.png
+.. image:: img/labware_lib/Tuberack-15-50ml.png
 
 
 Plates

docs/source/labware_library.rst

@@ -9,4 +9,12 @@ div#nav-spacer {
 
 div#nav-spacer.nav-open {
     height: 150px;
+}
+
+@media screen and (max-width: 875px),
+(max-device-width: 767px) {
+	header{
+		top: 0px;
+		left: 0px;
+	}
 }

docs/source/static/override_master.css

@@ -6,6 +6,7 @@ body {
     font-family: "Open Sans", "sans-serif";
 }
 
+
 /* DOCS */
 
 div.body p {
@@ -45,10 +46,12 @@ div.body h2 {
 
 @media screen and (max-width: 875px),
 (max-device-width: 767px) {
-    body {
-        margin: 0;
+
+
+    body{
         padding: 20px 30px;
     }
+
     div.documentwrapper {
         float: none;
         background: #fff;
@@ -114,7 +117,7 @@ div.body h2 {
     pre,
     tt,
     code {
-        font-size: 1.5em;
+        font-size: 1em;
     }
 }
 
@@ -139,9 +142,12 @@ ul ul {
     pre,
     tt,
     code {
-        font-size: 2em;
+        font-size: 14px;
     }
 }
 
-
-
+/* Fixes overflowing grey box for autogenerated methods */
+table.docutils.field-list {
+    max-width: 595px;
+    background-color: white;
+}

docs/source/static/override_sphinx.css

@@ -1,8 +1,4 @@
-{%- extends "basic/layout.html" %} 
-{% set css_files = css_files   + ['https://opentrons.com/css/master.css'] + ['_static/override_master.css'] + ['_static/override_sphinx.css'] %} 
-
-
-{%- block extrahead %} {{ super() }}
+{%- extends "basic/layout.html" %} {% set css_files = css_files + ['https://opentrons.com/css/master.css'] + ['_static/override_master.css'] + ['_static/override_sphinx.css'] %} {%- block extrahead %} {{ super() }}
 <link rel="stylesheet" href="{{ pathto('_static/custom.css', 1) }}" type="text/css" /> {% if theme_touch_icon %}
 <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" /> {% endif %} {% if theme_canonical_url %}
 <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html" /> {% endif %}
@@ -230,68 +226,57 @@ <h1 class="title">Get In Touch</h1>
 </footer>
 <script>
 $(document).ready(function() {
-    $(".footerForm").submit(function(event) {
-        var data = {};
-        $(".footerForm").serializeArray().map(function(x) {
-            data[x.name] = x.value;
-        });
-        ga('send', 'event', 'Contact - Email', 'Clicked Email Submit', window.location.href, {
-            'dimension1': data.email
-        });
-        console.log(data)
 
-        $.ajax({
-            type: "POST",
-            url: "https://email.opentrons.com:3000",
-            dataType: "json",
-            contentType: "application/json",
-            data: JSON.stringify(data),
-            success: function(res) {
-                console.log(`success: ${res}`);
-                $(".footerForm").fadeOut("slow");
-                $(".caption")[0].innerHTML = "Thanks for contacting us! We'll get back to you as quick as we can.";
-            },
-            error: function(err) {
-                console.log(`err: ${JSON.stringify(err)}`)
-            },
-        });
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-        event.preventDefault();
-    });
+ga('create', 'UA-83820700-1', 'auto');
+ga('send', 'pageview');
 
-    $("form.validate").submit(function(event) {
-        var data = {};
-        $("form.validate").serializeArray().map(function(x) {
-            data[x.name] = x.value;
-        });
-        ga('send', 'event', 'Newsletter', 'Signup', window.location.href, {
-            'dimension1': data.EMAIL
-        })
+  $(".footerForm").submit(function(event) {
+    event.preventDefault();
+    var data = {};
+    $(".footerForm").serializeArray().map(function(x){data[x.name] = x.value;});
+    ga('send', 'event', 'Contact - Email', 'Clicked Email Submit', window.location.href, { 'dimension1': data.email });
+    console.log(data)
+
+    $.ajax({
+      type: "POST",
+      url: "https://email.opentrons.com:3000",
+      dataType: "json",
+      contentType : "application/json",
+      data: JSON.stringify(data),
+      success: function(res) {
+        console.log(`success: ${res}`);
+        $(".footerForm").fadeOut("slow");
+        $(".caption")[0].innerHTML = "Thanks for contacting us! We'll get back to you as quick as we can.";
+      },
+      error: function(err) { console.log(`err: ${JSON.stringify(err)}`) },
     });
 
-    $('#chat').on('click', () => {
-        Intercom('showNewMessage');
-    })
+    
+    return false;
+  });
+
+  $("form.validate").submit(function(event) {
+    var data = {};
+    $("form.validate").serializeArray().map(function(x){data[x.name] = x.value;});
+    // ga('send', 'event', 'Newsletter', 'Signup', window.location.href, { 'dimension1': data.EMAIL })
+  });
+
+  $('#chat').on('click', () => {
+    Intercom('showNewMessage');
+  })
 });
 </script>
+
+
 {% if theme_github_banner|lower != 'false' %}
 <a href="https://github.com/{{ theme_github_user }}/{{ theme_github_repo }}" class="github">
     <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ pathto('_static/' ~ theme_github_banner, 1) if theme_github_banner|lower != 'true' else 'https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png' }}" alt="Fork me on GitHub" class="github" />
 </a>
 {% endif %} {% if theme_analytics_id %}
-<script type="text/javascript">
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', '{{ theme_analytics_id }}']);
-_gaq.push(['_setDomainName', 'none']);
-_gaq.push(['_setAllowLinker', true]);
-_gaq.push(['_trackPageview']);
-(function() {
-    var ga = document.createElement('script');
-    ga.type = 'text/javascript';
-    ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0];
-    s.parentNode.insertBefore(ga, s);
-})();
-</script>
+
 {% endif %} {%- endblock %}

docs/source/templates/layout.html

@@ -54,7 +54,7 @@ You can also split the coordinates for the rows and columns and use either ``.ro
   plate.cols[0][0] # A1
 
   plate.rows[0][1] # B1
-  plate.cols[1][0] # A2
+  plate.cols[0][1] # A2
 
 
 Rows