Skip to content

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Daisuke Baba committed Jan 27, 2017
2 parents aafd0cc + b6291d3 commit ae127a8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016, CANDY LINE, Inc.
Copyright (c) 2017 CANDY LINE INC.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ $ ./setup.py test
```

# Revision history
* 1.2.1
- Handle uncaught exception
- Suppress useless log

* 1.2.0
- Improve serial port resolver function
- Add a new feature to ensure the opened port is online on creating a new serial port object
Expand Down
7 changes: 6 additions & 1 deletion lib/candy_board_amt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ def run(self):
while True:
try:
connection, client_address = self.sock.accept()
print("Accepted from [%s]" % client_address)
connection.setblocking(0)

# request
Expand Down Expand Up @@ -259,6 +258,12 @@ def perform(self, cmd):
return self.error_message("Invalid Args")
except OSError:
return self.error_message("I/O Error")
except:
return self.error_message("Unexpected error: %s" %
(''.join(traceback
.format_exception(*sys.exc_info())[-2:])
.strip().replace('\n', ': '))
)

def error_message(self, msg):
return json.dumps({"status": "ERROR", "result": msg})
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from setuptools import setup, find_packages
from setuptools.command.test import test as TestCommand

version = "1.2.0"
version = "1.2.1"

try:
import pypandoc
Expand All @@ -27,8 +27,9 @@ def run_tests(self):
sys.exit(errno)

if sys.argv[-1] == 'publish':
os.system('python setup.py sdist upload')
os.system('python setup.py bdist_wheel upload')
os.system('rm -fr dist/*')
os.system('python setup.py sdist')
os.system('twine upload dist/*')
sys.exit()

setup(
Expand Down

0 comments on commit ae127a8

Please sign in to comment.