From dbd92e58c91ec9d4447749c6c9b4212b96a84e44 Mon Sep 17 00:00:00 2001 From: C4dmium <41113988+MarinMikael@users.noreply.github.com> Date: Thu, 1 Aug 2019 22:25:01 +0900 Subject: Update utils.py --- gerber/utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gerber/utils.py b/gerber/utils.py index 817a36e..3d39df9 100644 --- a/gerber/utils.py +++ b/gerber/utils.py @@ -123,6 +123,10 @@ def write_gerber_value(value, format=(2, 5), zero_suppression='trailing'): value : string The specified value as a Gerber/Excellon-formatted string. """ + + if format[0] == float: + return "%f" %value + # Format precision integer_digits, decimal_digits = format MAX_DIGITS = integer_digits + decimal_digits -- cgit From c08457f7addf2001f07fac5d30091b33b3ddcb0c Mon Sep 17 00:00:00 2001 From: C4dmium <41113988+MarinMikael@users.noreply.github.com> Date: Thu, 1 Aug 2019 22:26:06 +0900 Subject: Update excellon_statements.py --- gerber/excellon_statements.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gerber/excellon_statements.py b/gerber/excellon_statements.py index bcf35e4..2c50ef9 100644 --- a/gerber/excellon_statements.py +++ b/gerber/excellon_statements.py @@ -23,6 +23,7 @@ Excellon Statements import re import uuid +import itertools from .utils import (parse_gerber_value, write_gerber_value, decimal_string, inch, metric) @@ -151,8 +152,7 @@ class ExcellonTool(ExcellonStatement): tool : Tool An ExcellonTool representing the tool defined in `line` """ - commands = re.split('([BCFHSTZ])', line)[1:] - commands = [(command, value) for command, value in pairwise(commands)] + commands = pairwise(re.split('([BCFHSTZ])', line)[1:]) args = {} args['id'] = id nformat = settings.format @@ -973,6 +973,7 @@ def pairwise(iterator): e.g. [1, 2, 3, 4, 5, 6] ==> [(1, 2), (3, 4), (5, 6)] """ - itr = iter(iterator) - while True: - yield tuple([next(itr) for i in range(2)]) + a, b = itertools.tee(iterator) + itr = zip(itertools.islice(a, 0, None, 2), itertools.islice(b, 1, None, 2)) + for elem in itr: + yield elem -- cgit From e5094c04a785e10aefc306d86755fcc57f39fc34 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Silva Date: Mon, 25 Nov 2019 15:34:10 -0300 Subject: Rename requirements for docs and dev and upgrade nose and coverage packages --- README.md | 4 ++-- doc-requirements.txt | 4 ---- requirements-dev.txt | 5 +++++ requirements-docs.txt | 6 ++++++ requirements.txt | 2 +- test-requirements.txt | 4 ---- 6 files changed, 14 insertions(+), 11 deletions(-) delete mode 100644 doc-requirements.txt create mode 100644 requirements-dev.txt create mode 100644 requirements-docs.txt delete mode 100644 test-requirements.txt diff --git a/README.md b/README.md index f741f80..42c90f4 100644 --- a/README.md +++ b/README.md @@ -48,11 +48,11 @@ Documentation: Development and Testing: ------------------------ -Dependencies for developing and testing pcb-tools are listed in test-requirements.txt. Use of a virtual environment is strongly recommended. +Dependencies for developing and testing pcb-tools are listed in requirements-dev.txt. Use of a virtual environment is strongly recommended. $ virtualenv venv $ source venv/bin/activate - (venv)$ pip install -r test-requirements.txt + (venv)$ pip install -r requirements-dev.txt (venv)$ pip install -e . We use nose to run pcb-tools's suite of unittests and doctests. diff --git a/doc-requirements.txt b/doc-requirements.txt deleted file mode 100644 index a163c9b..0000000 --- a/doc-requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Doc requirements -Sphinx==1.2.3 -numpydoc==0.5 - diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..c1e695d --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,5 @@ +# install base requirements +-r requirements.txt + +coverage==4.5.4 +nose==1.3.7 diff --git a/requirements-docs.txt b/requirements-docs.txt new file mode 100644 index 0000000..a2cc5a1 --- /dev/null +++ b/requirements-docs.txt @@ -0,0 +1,6 @@ +# install base requirements +-r requirements.txt + +# documentation generation support +Sphinx==1.2.3 +numpydoc==0.5 diff --git a/requirements.txt b/requirements.txt index a7f5f01..1f769f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -## The following requirements were added by pip --freeze: +# cairo rendering support cairocffi==0.6 diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 826da33..0000000 --- a/test-requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Test requirements -cairocffi==0.6 -coverage==3.7.1 -nose==1.3.4 -- cgit From 2b6ea5ead81ac069452d73e00f3b19d4325611d0 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Silva Date: Mon, 25 Nov 2019 15:34:37 -0300 Subject: Upgrade for new requirements-dev.txt --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7525487..d4c40c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,7 @@ python: # command to install dependencies install: - - "pip install -r requirements.txt" - - "pip install -r test-requirements.txt" + - "pip install -r requirements-dev.txt" - "pip install coveralls" # command to run tests -- cgit