Split tests into two modules, one for shapely

kageurufu · Feb 10, 2022 · d3263d6 · d3263d6
1 parent 1244064
commit d3263d6
Show file tree

Hide file tree

Showing 7 changed files with 639 additions and 511 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
           python-version: '3.9.x'
       - run: |
           pip install -U pip poetry
-          poetry install
+          poetry install -E shapely
         env:
           POETRY_VIRTUALENVS_CREATE: false
       

diff --git a/poetry.lock b/poetry.lock
diff --git a/preprocess_cancellation.py b/preprocess_cancellation.py
@@ -1,19 +1,19 @@
 #!/usr/bin/env python3
 from __future__ import annotations
+
 import argparse
 import json
 import logging
-import time
 import pathlib
 import platform
 import re
 import shutil
 import statistics
 import sys
 import tempfile
+import time
 from typing import Any, Dict, List, NamedTuple, Optional, Set, Tuple, TypeVar
 
-
 logging.basicConfig(stream=sys.stderr, level=logging.INFO)
 logger = logging.getLogger("prepropress_cancellation")
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -17,7 +17,8 @@ preprocess_cancellation = 'preprocess_cancellation:_main'
 shapely = [ "shapely" ]
 
 [tool.poetry.dependencies]
-python = ">= 3.6.0"
+python = ">= 3.6.2"
+
 shapely = { version = "*", optional = true }
 
 [tool.poetry.dev-dependencies]
@@ -28,6 +29,7 @@ matplotlib = "*"
 pyinstaller = "*"
 pytest = "*"
 pytest-cov = "*"
+shapely = "*"
 
 [tool.black]
 line_length = 120

diff --git a/test_preprocessor.py b/test_preprocessor.py
diff --git a/test_preprocessor_with_shapely.py b/test_preprocessor_with_shapely.py
diff --git a/tools/plot_defines.py b/tools/plot_defines.py
@@ -2,6 +2,8 @@
 import sys
 
 import matplotlib.pyplot
+import argparse
+
 
 for filename in sys.argv[1:]:
 
@@ -25,6 +27,6 @@
             )[0]
             matplotlib.pyplot.plot(object["CENTER"][0], object["CENTER"][1], "-go", color=geom.get_color())
 
-        matplotlib.pyplot.legend(loc='center left', bbox_to_anchor=(1, 0.5))
+        matplotlib.pyplot.legend(loc="center left", bbox_to_anchor=(1, 0.5))
         matplotlib.pyplot.tight_layout()
         matplotlib.pyplot.show()