From 1e84bf0af662cd15cc194dccedf033c9e67cda3b Mon Sep 17 00:00:00 2001
From: Sylvain Soliman <Sylvain.Soliman@inria.fr>
Date: Fri, 23 Dec 2022 10:07:45 +0100
Subject: [PATCH] pull request from Ben + version bump
---
casq/__init__.py | 2 +-
casq/celldesigner2qual.py | 15 ++++++++++-----
test/test_casq.py | 3 ++-
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/casq/__init__.py b/casq/__init__.py
index 6e4068b..e85f286 100644
--- a/casq/__init__.py
+++ b/casq/__init__.py
@@ -18,4 +18,4 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
"""
# Don't forget to git tag v<version> && git push --tags
-version = "1.1.5" # pylint: disable=invalid-name
+version = "1.2.0" # pylint: disable=invalid-name
diff --git a/casq/celldesigner2qual.py b/casq/celldesigner2qual.py
index dc68de8..56e724b 100755
--- a/casq/celldesigner2qual.py
+++ b/casq/celldesigner2qual.py
@@ -1012,9 +1012,8 @@ def map_to_model(map_filename: str, model_filename: str, bma=False):
if not bma:
write_qual(model_filename, info, width, height)
else:
- bmaExport.write_bma(
- model_filename, info, 1, None, False, True
- )
+ bmaExport.write_bma(model_filename, info, 1, None, False, True)
+
def main():
"""Run conversion using the CLI given first argument."""
@@ -1022,7 +1021,10 @@ def main():
description=" ".join(__doc__.splitlines()[:3]) + " GPLv3"
)
parser.add_argument(
- "-v", "--version", action="version", version=f"%(prog)s v{version}",
+ "-v",
+ "--version",
+ action="version",
+ version=f"%(prog)s v{version}",
)
parser.add_argument(
"-D", "--debug", action="store_true", help="Display a lot of debug information"
@@ -1093,7 +1095,10 @@ def main():
help="CellDesigner File",
)
parser.add_argument(
- "-b", "--bma", action="store_true", help="Output to BMA json format",
+ "-b",
+ "--bma",
+ action="store_true",
+ help="Output to BMA json format",
)
parser.add_argument(
"-g",
diff --git a/test/test_casq.py b/test/test_casq.py
index 83c8a38..287d1a2 100644
--- a/test/test_casq.py
+++ b/test/test_casq.py
@@ -12,7 +12,8 @@ import pytest # type: ignore
@pytest.mark.parametrize(
- "infile", glob(path.join(str(path.dirname(path.realpath(__file__))), "*.xml")),
+ "infile",
+ glob(path.join(str(path.dirname(path.realpath(__file__))), "*.xml")),
)
def test_casq_produces_valid_files(tmp_path, infile):
"""Check if the files we produce are valid."""
--
GitLab