Skip to content

Commit

Permalink
Merge pull request #1176 from Opentrons/api_wifi-list-hotfix
Browse files Browse the repository at this point in the history
Hotfix wifi endpoints (release: 3.0.0-beta.6)
  • Loading branch information
btmorr authored Apr 10, 2018
2 parents 6b82f4c + 812df97 commit 4b9c169
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion api/opentrons/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

# This file is generated during setup--do not edit manually

__version__ = '3.0.0-beta.5'
__version__ = '3.0.0-beta.6'
3 changes: 2 additions & 1 deletion api/opentrons/server/endpoints/wifi.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ def _subprocess(cmd: str) -> (str, str):
:param cmd: a command string to execute in a subprocess shell
:return: (stdout, stderr)
"""
proc = subprocess.run(cmd, shell=True, stdout=subprocess.PIPE)
proc = subprocess.run(
cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out = proc.stdout.decode().strip()
err = proc.stderr.decode().strip()
return out, err
2 changes: 1 addition & 1 deletion api/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0-beta.5
3.0.0-beta.6
2 changes: 1 addition & 1 deletion app-shell/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@opentrons/app-shell",
"productName": "Opentrons",
"version": "3.0.0-beta.5",
"version": "3.0.0-beta.6",
"description": "Opentrons desktop application",
"main": "lib/main.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentrons/app",
"version": "3.0.0-beta.5",
"version": "3.0.0-beta.6",
"description": "Opentrons desktop application UI",
"main": "src/index.js",
"repository": {
Expand All @@ -17,8 +17,8 @@
},
"homepage": "https://github.com/Opentrons/opentrons",
"devDependencies": {
"@opentrons/app-shell": "3.0.0-beta.5",
"@opentrons/webpack-config": "3.0.0-beta.5",
"@opentrons/app-shell": "3.0.0-beta.6",
"@opentrons/webpack-config": "3.0.0-beta.6",
"babel-core": "^6.25.0",
"babel-loader": "^7.1.1",
"babel-plugin-transform-class-properties": "^6.24.1",
Expand Down Expand Up @@ -57,7 +57,7 @@
"ws": "3.1.0"
},
"dependencies": {
"@opentrons/components": "3.0.0-beta.5",
"@opentrons/components": "3.0.0-beta.6",
"bonjour": "^3.5.0",
"classnames": "^2.2.5",
"electron": "1.8.3",
Expand Down
4 changes: 2 additions & 2 deletions components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentrons/components",
"version": "3.0.0-beta.5",
"version": "3.0.0-beta.6",
"description": "React components library for Opentrons' projects",
"main": "src/index.js",
"style": "src/index.css",
Expand All @@ -15,7 +15,7 @@
},
"homepage": "https://github.com/Opentrons/opentrons#readme",
"devDependencies": {
"@opentrons/webpack-config": "3.0.0-beta.5",
"@opentrons/webpack-config": "3.0.0-beta.6",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
Expand Down
2 changes: 1 addition & 1 deletion labware-definitions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentrons/labware-definitions",
"version": "3.0.0-beta.5",
"version": "3.0.0-beta.6",
"description": "Default labware definitions for Opentrons robots",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.0.0-beta.5",
"version": "3.0.0-beta.6",
"private": true,
"workspaces": [
"app",
Expand Down
6 changes: 3 additions & 3 deletions protocol-designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"name": "protocol-designer",
"private": true,
"version": "3.0.0-beta.5",
"version": "3.0.0-beta.6",
"description": "Protocol designer app",
"main": "src/index.js",
"bugs": {
Expand All @@ -18,7 +18,7 @@
"homepage": "https://github.com/OpenTrons/opentrons",
"license": "Apache-2.0",
"dependencies": {
"@opentrons/components": "3.0.0-beta.5",
"@opentrons/components": "3.0.0-beta.6",
"classnames": "^2.2.5",
"lodash": "^4.17.4",
"normalize.css": "^7.0.0",
Expand All @@ -33,7 +33,7 @@
"reselect": "^3.0.1"
},
"devDependencies": {
"@opentrons/webpack-config": "3.0.0-beta.5",
"@opentrons/webpack-config": "3.0.0-beta.6",
"babel-cli": "^6.26.0",
"babel-core": "^6.25.0",
"babel-loader": "^7.1.1",
Expand Down
2 changes: 1 addition & 1 deletion webpack-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentrons/webpack-config",
"version": "3.0.0-beta.5",
"version": "3.0.0-beta.6",
"description": "Shareable pieces of webpack configuration",
"main": "index.js",
"repository": {
Expand Down

0 comments on commit 4b9c169

Please sign in to comment.