diff --git a/.github/workflows/ironpython.yml b/.github/workflows/ironpython.yml deleted file mode 100644 index 6076db0850c3..000000000000 --- a/.github/workflows/ironpython.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: ironpython - -on: - push: - branches: - - main - - '*.LTS' - pull_request: - branches: - - main - - '*.LTS' - -jobs: - build: - name: windows-ironpython - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - - name: "[RPC tests] Set up CPython 3.9" - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - name: "[RPC tests] Install CPython dependencies" - run: | - python -m pip install --upgrade pip - - name: "[RPC tests] Install COMPAS on CPython" - run: | - pip install --no-cache-dir . - - name: Install dependencies - run: | - choco install ironpython --version=2.7.8.1 - curl -o ironpython-pytest.tar.gz -LJO https://pypi.debian.net/ironpython-pytest/latest - ipy -X:Frames -m ensurepip - ipy -X:Frames -m pip install --no-deps ironpython-pytest.tar.gz - - uses: NuGet/setup-nuget@v1.0.5 - - name: Install dependencies - run: | - choco install ironpython --version=2.7.8.1 - - uses: compas-dev/compas-actions.ghpython_components@v2 - with: - source: src/compas_ghpython/components - target: src/compas_ghpython/components - - name: Test import - run: | - ipy -m compas - env: - IRONPYTHONPATH: ./src - - name: Run tests - run: | - ipy tests/ipy_test_runner.py - env: - IRONPYTHONPATH: ./src diff --git a/src/compas/__init__.py b/src/compas/__init__.py index edc2cfc21805..845670a47c8e 100644 --- a/src/compas/__init__.py +++ b/src/compas/__init__.py @@ -1,4 +1,4 @@ -from __future__ import print_function +# ruff: noqa: F401 import os @@ -103,34 +103,6 @@ pass -__all__ = [ - "WINDOWS", - "LINUX", - "OSX", - "MONO", - "IPY", - "RHINO", - "BLENDER", - "PY2", - "PY3", - "devday", - "is_windows", - "is_linux", - "is_osx", - "is_mono", - "is_ironpython", - "is_rhino", - "is_blender", - "is_grasshopper", - "get", - "json_dump", - "json_load", - "json_dumps", - "json_dumpz", - "json_loads", - "json_loadz", -] - __all_plugins__ = [ "compas.geometry.booleans_shapely", "compas.scene", diff --git a/src/compas/_iotools.py b/src/compas/_iotools.py index e4bcc1d602d0..ea8922f49802 100644 --- a/src/compas/_iotools.py +++ b/src/compas/_iotools.py @@ -2,11 +2,7 @@ import io from contextlib import contextmanager - -try: - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen +from urllib.request import urlopen @contextmanager diff --git a/src/compas/colors/__init__.py b/src/compas/colors/__init__.py index b9b5b290c1a4..cbd23c70c23a 100644 --- a/src/compas/colors/__init__.py +++ b/src/compas/colors/__init__.py @@ -2,13 +2,8 @@ This package defines a color and color map class, that can be used to work wihth colors in a consistent way across color spaces. """ - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function +# ruff: noqa: F401 from .color import Color from .colormap import ColorMap from .colordict import ColorDict - -__all__ = ["Color", "ColorMap", "ColorDict"] diff --git a/src/compas/colors/color.py b/src/compas/colors/color.py index 5035ddea8120..5f90c210c9e5 100644 --- a/src/compas/colors/color.py +++ b/src/compas/colors/color.py @@ -1,12 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -try: - basestring # type: ignore -except NameError: - basestring = str - import colorsys import re @@ -16,10 +7,7 @@ BASE16 = "0123456789abcdef" -try: - HEX_DEC = {v: int(v, base=16) for v in [x + y for x in BASE16 for y in BASE16]} -except Exception: - HEX_DEC = {v: int(v, 16) for v in [x + y for x in BASE16 for y in BASE16]} +HEX_DEC = {v: int(v, base=16) for v in [x + y for x in BASE16 for y in BASE16]} class ColorError(Exception): @@ -567,7 +555,7 @@ def from_unknown(cls, unknown): if Color._is_rgb1(unknown): return cls(*list(unknown)) - if isinstance(unknown, basestring): + if isinstance(unknown, str): return cls.from_name(unknown) raise ColorError @@ -633,7 +621,7 @@ def _is_hex(color): bool """ - if isinstance(color, basestring): + if isinstance(color, str): match = re.search(r"^#(?:[0-9a-fA-F]{3}){1,2}$", color) if match: return True diff --git a/src/compas/colors/colordict.py b/src/compas/colors/colordict.py index 18a69bd587e9..bba72d610a6e 100644 --- a/src/compas/colors/colordict.py +++ b/src/compas/colors/colordict.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.data import Data from .color import Color diff --git a/src/compas/colors/colormap.py b/src/compas/colors/colormap.py index 0b0ac1bba274..07f4254d7fb6 100644 --- a/src/compas/colors/colormap.py +++ b/src/compas/colors/colormap.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import os from compas.itertools import linspace diff --git a/src/compas/data/__init__.py b/src/compas/data/__init__.py index 1d6786efa566..d151ee0b6eed 100644 --- a/src/compas/data/__init__.py +++ b/src/compas/data/__init__.py @@ -2,8 +2,7 @@ This package defines the core infrastructure for data serialisation in the COMPAS framework. It provides a base class for data objects, a JSON encoder and decoder, serialisers and deserialisers, and schema validation. """ - -from __future__ import absolute_import +# ruff: noqa: F401 from .exceptions import DecoderError from .encoders import DataEncoder @@ -12,20 +11,3 @@ from .json import json_load, json_loads, json_loadz, json_dump, json_dumps, json_dumpz from .schema import dataclass_dataschema, dataclass_typeschema, dataclass_jsonschema from .schema import compas_dataclasses - -__all__ = [ - "Data", - "DataEncoder", - "DataDecoder", - "DecoderError", - "json_load", - "json_loads", - "json_loadz", - "json_dump", - "json_dumps", - "json_dumpz", - "dataclass_dataschema", - "dataclass_typeschema", - "dataclass_jsonschema", - "compas_dataclasses", -] diff --git a/src/compas/data/coercion.py b/src/compas/data/coercion.py index 80581dc17ef8..ddc36e9fe331 100644 --- a/src/compas/data/coercion.py +++ b/src/compas/data/coercion.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from .validators import is_item_iterable diff --git a/src/compas/data/data.py b/src/compas/data/data.py index aaaf562f0bd1..a2d7469b23d8 100644 --- a/src/compas/data/data.py +++ b/src/compas/data/data.py @@ -1,34 +1,15 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -try: - from typing import TypeVar # noqa: F401 - - D = TypeVar("D", bound="Data") -except ImportError: - pass - import hashlib from copy import deepcopy +from typing import TypeVar from uuid import UUID from uuid import uuid4 import compas -# ============================================================================== -# If you ever feel tempted to use ABCMeta in your code: don't, just DON'T. -# Assigning __metaclass__ = ABCMeta to a class causes a severe memory leak/performance -# degradation on IronPython 2.7. - -# See these issues for more details: -# - https://github.com/compas-dev/compas/issues/562 -# - https://github.com/compas-dev/compas/issues/649 - -# ============================================================================== +D = TypeVar("D", bound="Data") -class Data(object): +class Data: """Abstract base class for all COMPAS data objects. Parameters @@ -145,7 +126,7 @@ def __setstate__(self, state): self.name = state["name"] @classmethod - def __from_data__(cls, data): # type: (dict) -> Data + def __from_data__(cls, data) -> "Data": """Construct an object of this type from the provided data. Parameters @@ -190,7 +171,7 @@ def name(self, name): self._name = name @classmethod - def from_json(cls, filepath): # type: (...) -> Data + def from_json(cls, filepath) -> "Data": """Construct an object of this type from a JSON file. Parameters @@ -232,7 +213,7 @@ def to_json(self, filepath, pretty=False, compact=False, minimal=False): compas.json_dump(self, filepath, pretty=pretty, compact=compact, minimal=minimal) @classmethod - def from_jsonstring(cls, string): # type: (...) -> Data + def from_jsonstring(cls, string) -> "Data": """Construct an object of this type from a JSON string. Parameters @@ -276,7 +257,7 @@ def to_jsonstring(self, pretty=False, compact=False, minimal=False): """ return compas.json_dumps(self, pretty=pretty, compact=compact, minimal=minimal) - def copy(self, cls=None, copy_guid=False): # type: (...) -> D + def copy(self, cls=None, copy_guid=False) -> D: # type: ignore """Make an independent copy of the data object. Parameters diff --git a/src/compas/data/encoders.py b/src/compas/data/encoders.py index c77bcdca26ce..1606f141d3c8 100644 --- a/src/compas/data/encoders.py +++ b/src/compas/data/encoders.py @@ -1,16 +1,10 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -try: - from typing import Type # noqa: F401 -except ImportError: - pass - import json import platform +from typing import Type -from .data import Data # noqa: F401 +import numpy as np + +from .data import Data from .exceptions import DecoderError IDictionary = None @@ -27,20 +21,8 @@ except: # noqa: E722 pass -try: - import numpy as np - - try: - np_float = np.float_ - except AttributeError: - np_float = np.float64 - - numpy_support = True -except (ImportError, SyntaxError): - numpy_support = False - -def cls_from_dtype(dtype, inheritance=None): # type: (...) -> Type[Data] +def cls_from_dtype(dtype, inheritance=None) -> Type[Data]: """Get the class object corresponding to a COMPAS data type specification. Parameters @@ -144,32 +126,31 @@ def default(self, o): if hasattr(o, "__next__"): return list(o) - if numpy_support: - if isinstance(o, np.ndarray): - return o.tolist() - if isinstance( - o, - ( - np.int_, - np.intc, - np.intp, - np.int8, - np.int16, - np.int32, - np.int64, - np.uint8, - np.uint16, - np.uint32, - np.uint64, - ), # type: ignore - ): - return int(o) - if isinstance(o, (np_float, np.float16, np.float32, np.float64)): # type: ignore - return float(o) - if isinstance(o, np.bool_): - return bool(o) - if isinstance(o, np.void): - return None + if isinstance(o, np.ndarray): + return o.tolist() + if isinstance( + o, + ( + np.int_, + np.intc, + np.intp, + np.int8, + np.int16, + np.int32, + np.int64, + np.uint8, + np.uint16, + np.uint32, + np.uint64, + ), # type: ignore + ): + return int(o) + if isinstance(o, (np.float_, np.float16, np.float32, np.float64)): # type: ignore + return float(o) + if isinstance(o, np.bool_): + return bool(o) + if isinstance(o, np.void): + return None if dotnet_support: if isinstance(o, (System.Decimal, System.Double, System.Single)): @@ -217,7 +198,7 @@ class DataDecoder(json.JSONDecoder): """ def __init__(self, *args, **kwargs): - super(DataDecoder, self).__init__(object_hook=self.object_hook, *args, **kwargs) + super().__init__(object_hook=self.object_hook, *args, **kwargs) def object_hook(self, o): """Reconstruct a deserialized object. diff --git a/src/compas/data/json.py b/src/compas/data/json.py index 73bda1e24844..03b65c7146d9 100644 --- a/src/compas/data/json.py +++ b/src/compas/data/json.py @@ -1,12 +1,7 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import json import zipfile from compas import _iotools -from compas.data import Data # noqa: F401 from compas.data import DataDecoder from compas.data import DataEncoder @@ -66,7 +61,7 @@ def json_dump(data, fp, pretty=False, compact=False, minimal=False): return json.dump(data, f, cls=DataEncoder, **kwargs) -def json_dumps(data, pretty=False, compact=False, minimal=False): # type: (...) -> str +def json_dumps(data, pretty=False, compact=False, minimal=False) -> str: """Write a collection of COMPAS objects to a JSON string. Parameters @@ -173,7 +168,7 @@ def json_loadz(zip_file): return json_loads(json_str) -def json_load(fp): # type: (...) -> dict +def json_load(fp) -> dict: """Read COMPAS object data from a JSON file. Parameters @@ -207,7 +202,7 @@ def json_load(fp): # type: (...) -> dict return json.load(f, cls=DataDecoder) -def json_loads(s): # type: (...) -> dict +def json_loads(s) -> dict: """Read COMPAS object data from a JSON string. Parameters diff --git a/src/compas/data/schema.py b/src/compas/data/schema.py index dd051be09a40..46f2e5b37a02 100644 --- a/src/compas/data/schema.py +++ b/src/compas/data/schema.py @@ -1,12 +1,8 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import json import os -def dataclass_dataschema(cls): # type: (...) -> dict +def dataclass_dataschema(cls) -> dict: """Generate a JSON schema for a COMPAS object class. Parameters @@ -23,7 +19,7 @@ def dataclass_dataschema(cls): # type: (...) -> dict return cls.DATASCHEMA -def dataclass_typeschema(cls): # type: (...) -> dict +def dataclass_typeschema(cls) -> dict: """Generate a JSON schema for the data type of a COMPAS object class. Parameters @@ -43,7 +39,7 @@ def dataclass_typeschema(cls): # type: (...) -> dict } -def dataclass_jsonschema(cls, filepath=None, draft=None): # type: (...) -> dict +def dataclass_jsonschema(cls, filepath=None, draft=None) -> dict: """Generate a JSON schema for a COMPAS object class. Parameters @@ -85,7 +81,7 @@ def dataclass_jsonschema(cls, filepath=None, draft=None): # type: (...) -> dict return schema -def compas_jsonschema(dirname=None): # type: (...) -> list +def compas_jsonschema(dirname=None) -> list: """Generate a JSON schema for the COMPAS data model. Parameters @@ -110,7 +106,7 @@ def compas_jsonschema(dirname=None): # type: (...) -> list return schemas -def compas_dataclasses(): # type: (...) -> list +def compas_dataclasses() -> list: """Find all classes in the COMPAS data model. Returns diff --git a/src/compas/data/validators.py b/src/compas/data/validators.py index acc6f47bf168..fc3c320f8d9c 100644 --- a/src/compas/data/validators.py +++ b/src/compas/data/validators.py @@ -1,13 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -try: - basestring # type: ignore -except NameError: - basestring = str - - def is_sequence_of_str(items): """Verify that the sequence contains only items of type str. @@ -23,7 +13,7 @@ def is_sequence_of_str(items): False otherwise. """ - return all(isinstance(item, basestring) for item in items) + return all(isinstance(item, str) for item in items) def is_sequence_of_int(items): diff --git a/src/compas/datastructures/__init__.py b/src/compas/datastructures/__init__.py index 693dba34b809..c2c85a7a8006 100644 --- a/src/compas/datastructures/__init__.py +++ b/src/compas/datastructures/__init__.py @@ -2,22 +2,11 @@ This package defines the core data structures of the COMPAS framework. The data structures provide a structured way of storing and accessing data on individual components of both topological and geometrical objects. """ - -from __future__ import absolute_import +# ruff: noqa: F401 from .datastructure import Datastructure -# ============================================================================= -# Graphs -# ============================================================================= - -from .graph.planarity import graph_embed_in_plane_proxy # noqa: F401 - -# ============================================================================= -# Meshes -# ============================================================================= - -from .mesh.conway import ( # noqa: F401 +from .mesh.conway import ( mesh_conway_ambo, mesh_conway_bevel, mesh_conway_dual, @@ -32,20 +21,8 @@ mesh_conway_truncate, mesh_conway_zip, ) -from .mesh.smoothing import mesh_smooth_centerofmass # noqa: F401 -from .mesh.subdivision import trimesh_subdivide_loop # noqa: F401 - -# ============================================================================= -# Halffaces -# ============================================================================= - -# ============================================================================= -# Volmeshes -# ============================================================================= - -# ============================================================================= -# Class APIs -# ============================================================================= +from .mesh.smoothing import mesh_smooth_centerofmass +from .mesh.subdivision import trimesh_subdivide_loop from .graph.graph import Graph from .mesh.mesh import Mesh @@ -56,23 +33,3 @@ from .cell_network.cell_network import CellNetwork from .tree.tree import Tree, TreeNode from .tree.hashtree import HashTree, HashNode - -Network = Graph - -__all__ = [ - "Datastructure", - "CellNetwork", - "Mesh", - "VolMesh", - "Assembly", - "Part", - "AssemblyError", - "FeatureError", - "Feature", - "GeometricFeature", - "ParametricFeature", - "Tree", - "TreeNode", - "HashTree", - "HashNode", -] diff --git a/src/compas/datastructures/_mutablemapping.py b/src/compas/datastructures/_mutablemapping.py index d9d2273552e4..c1c824700384 100644 --- a/src/compas/datastructures/_mutablemapping.py +++ b/src/compas/datastructures/_mutablemapping.py @@ -10,19 +10,10 @@ - https://github.com/compas-dev/compas/issues/649 """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function +import collections.abc as stdlib_collections -import compas -if compas.PY2: - import collections as stdlib_collections -else: - import collections.abc as stdlib_collections - - -class Mapping(object): +class Mapping: __slots__ = () """A Mapping is a generic container for associating key/value diff --git a/src/compas/datastructures/assembly/assembly.py b/src/compas/datastructures/assembly/assembly.py index 66a825cf5c9f..57a6f943647e 100644 --- a/src/compas/datastructures/assembly/assembly.py +++ b/src/compas/datastructures/assembly/assembly.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.datastructures import Datastructure from compas.datastructures import Graph diff --git a/src/compas/datastructures/assembly/part.py b/src/compas/datastructures/assembly/part.py index 1e25a93db05b..379e4e81d05a 100644 --- a/src/compas/datastructures/assembly/part.py +++ b/src/compas/datastructures/assembly/part.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.data import Data from compas.datastructures import Datastructure from compas.geometry import Brep diff --git a/src/compas/datastructures/attributes.py b/src/compas/datastructures/attributes.py index 97156bfa5a18..95a7f3a82648 100644 --- a/src/compas/datastructures/attributes.py +++ b/src/compas/datastructures/attributes.py @@ -1,8 +1,5 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from compas.datastructures._mutablemapping import MutableMapping +# from compas.datastructures._mutablemapping import MutableMapping +from collections.abc import MutableMapping class AttributeView(MutableMapping): diff --git a/src/compas/datastructures/cell_network/cell_network.py b/src/compas/datastructures/cell_network/cell_network.py index 6d6cb9d173cb..03c6f4e2276e 100644 --- a/src/compas/datastructures/cell_network/cell_network.py +++ b/src/compas/datastructures/cell_network/cell_network.py @@ -1,8 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from ast import literal_eval from random import sample diff --git a/src/compas/datastructures/datastructure.py b/src/compas/datastructures/datastructure.py index b144595e0727..0a999724f9b5 100644 --- a/src/compas/datastructures/datastructure.py +++ b/src/compas/datastructures/datastructure.py @@ -1,16 +1,9 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -try: - from typing import TypeVar # noqa: F401 -except ImportError: - pass -else: - G = TypeVar("G", bound="Datastructure") +from typing import TypeVar # noqa: F401 from compas.data import Data +G = TypeVar("G", bound="Datastructure") + class Datastructure(Data): """Base class for all data structures.""" diff --git a/src/compas/datastructures/graph/duality.py b/src/compas/datastructures/graph/duality.py index 89482267878e..20596465e76d 100644 --- a/src/compas/datastructures/graph/duality.py +++ b/src/compas/datastructures/graph/duality.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import pi from compas.geometry import angle_vectors diff --git a/src/compas/datastructures/graph/graph.py b/src/compas/datastructures/graph/graph.py index 49b396fcf8e7..e11dad816db3 100644 --- a/src/compas/datastructures/graph/graph.py +++ b/src/compas/datastructures/graph/graph.py @@ -1,19 +1,9 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from ast import literal_eval +from collections.abc import Mapping from itertools import combinations from random import sample from random import shuffle -import compas - -if compas.PY2: - from collections import Mapping -else: - from collections.abc import Mapping - from compas.datastructures.attributes import EdgeAttributeView from compas.datastructures.attributes import NodeAttributeView from compas.datastructures.datastructure import Datastructure diff --git a/src/compas/datastructures/graph/planarity.py b/src/compas/datastructures/graph/planarity.py index 1e3802b1fc46..f69254404a07 100644 --- a/src/compas/datastructures/graph/planarity.py +++ b/src/compas/datastructures/graph/planarity.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from itertools import product from math import cos from math import pi @@ -13,14 +9,6 @@ from compas.geometry._core.predicates_2 import is_intersection_segment_segment_xy -def graph_embed_in_plane_proxy(data, fixed=None): - from compas.datastructures import Graph - - graph = Graph.__from_data__(data) - graph_embed_in_plane(graph, fixed=fixed) - return graph.to_data() - - def graph_is_crossed(graph): """Verify if a graph has crossing edges. diff --git a/src/compas/datastructures/graph/smoothing.py b/src/compas/datastructures/graph/smoothing.py index 457048eb48a3..a2cf44bebaa6 100644 --- a/src/compas/datastructures/graph/smoothing.py +++ b/src/compas/datastructures/graph/smoothing.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import centroid_points diff --git a/src/compas/datastructures/mesh/conway.py b/src/compas/datastructures/mesh/conway.py index 09b56a0f853b..c7360faf4e88 100644 --- a/src/compas/datastructures/mesh/conway.py +++ b/src/compas/datastructures/mesh/conway.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - def mesh_conway_dual(mesh): """Generates the dual mesh from a seed mesh. diff --git a/src/compas/datastructures/mesh/duality.py b/src/compas/datastructures/mesh/duality.py index d1b17f85d271..85e88b61c7c8 100644 --- a/src/compas/datastructures/mesh/duality.py +++ b/src/compas/datastructures/mesh/duality.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import pi from compas.itertools import flatten diff --git a/src/compas/datastructures/mesh/mesh.py b/src/compas/datastructures/mesh/mesh.py index 81e371780d70..9e29620c0b65 100644 --- a/src/compas/datastructures/mesh/mesh.py +++ b/src/compas/datastructures/mesh/mesh.py @@ -1,18 +1,8 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - +from collections.abc import Mapping from itertools import product from math import pi from random import sample -import compas - -if compas.PY2: - from collections import Mapping -else: - from collections.abc import Mapping - from compas.datastructures.attributes import EdgeAttributeView from compas.datastructures.attributes import FaceAttributeView from compas.datastructures.attributes import VertexAttributeView @@ -554,7 +544,7 @@ def from_shape(cls, shape, **kwargs): # type: (Shape, dict) -> Mesh A mesh object. """ - vertices, faces = shape.to_vertices_and_faces(**kwargs) + vertices, faces = shape.to_vertices_and_faces(**kwargs) # type: ignore mesh = cls.from_vertices_and_faces(vertices, faces) mesh.name = shape.name return mesh diff --git a/src/compas/datastructures/mesh/operations/collapse.py b/src/compas/datastructures/mesh/operations/collapse.py index 8f5c688cb81a..507b61f066cb 100644 --- a/src/compas/datastructures/mesh/operations/collapse.py +++ b/src/compas/datastructures/mesh/operations/collapse.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - def is_collapse_legal(mesh, edge, allow_boundary=False): """Verify if the requested collapse is legal for a triangle mesh. diff --git a/src/compas/datastructures/mesh/operations/insert.py b/src/compas/datastructures/mesh/operations/insert.py index 0d68bf9dce0c..d5c3d7b9d2c7 100644 --- a/src/compas/datastructures/mesh/operations/insert.py +++ b/src/compas/datastructures/mesh/operations/insert.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - def mesh_add_vertex_to_face_edge(mesh, key, fkey, v): """Add an existing vertex of the mesh to an existing face. diff --git a/src/compas/datastructures/mesh/operations/merge.py b/src/compas/datastructures/mesh/operations/merge.py index d5cf5c77e30c..318ea4c7a935 100644 --- a/src/compas/datastructures/mesh/operations/merge.py +++ b/src/compas/datastructures/mesh/operations/merge.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - def mesh_merge_faces(mesh, faces): """Merge two faces of a mesh over their shared edge. diff --git a/src/compas/datastructures/mesh/operations/split.py b/src/compas/datastructures/mesh/operations/split.py index 08e5e376b053..c02ab9d0017e 100644 --- a/src/compas/datastructures/mesh/operations/split.py +++ b/src/compas/datastructures/mesh/operations/split.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.itertools import pairwise diff --git a/src/compas/datastructures/mesh/operations/substitute.py b/src/compas/datastructures/mesh/operations/substitute.py index 571618645f0a..f75bee6a80af 100644 --- a/src/compas/datastructures/mesh/operations/substitute.py +++ b/src/compas/datastructures/mesh/operations/substitute.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - def mesh_substitute_vertex_in_faces(mesh, old_vkey, new_vkey, fkeys=None): """Substitute in a mesh a vertex by another one. In all faces by default or in a given set of faces. diff --git a/src/compas/datastructures/mesh/operations/swap.py b/src/compas/datastructures/mesh/operations/swap.py index f36ef35ba5f8..5c86cb485ba5 100644 --- a/src/compas/datastructures/mesh/operations/swap.py +++ b/src/compas/datastructures/mesh/operations/swap.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - def trimesh_swap_edge(mesh, edge, allow_boundary=True): """Replace an edge of the mesh by an edge connecting the opposite vertices of the adjacent faces. diff --git a/src/compas/datastructures/mesh/operations/weld.py b/src/compas/datastructures/mesh/operations/weld.py index 015a3c1cfab4..19855ee93861 100644 --- a/src/compas/datastructures/mesh/operations/weld.py +++ b/src/compas/datastructures/mesh/operations/weld.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.itertools import pairwise from compas.topology import connected_components from compas.topology import vertex_adjacency_from_edges diff --git a/src/compas/datastructures/mesh/remesh.py b/src/compas/datastructures/mesh/remesh.py index e47bf46b2699..97c7e4144802 100644 --- a/src/compas/datastructures/mesh/remesh.py +++ b/src/compas/datastructures/mesh/remesh.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from .operations.collapse import trimesh_collapse_edge from .operations.split import trimesh_split_edge from .operations.swap import trimesh_swap_edge diff --git a/src/compas/datastructures/mesh/smoothing.py b/src/compas/datastructures/mesh/smoothing.py index ffe1f3151cbd..046cf7289fbc 100644 --- a/src/compas/datastructures/mesh/smoothing.py +++ b/src/compas/datastructures/mesh/smoothing.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import centroid_points from compas.geometry import centroid_polygon diff --git a/src/compas/datastructures/mesh/subdivision.py b/src/compas/datastructures/mesh/subdivision.py index 375c48eff78a..2e15e51df1ea 100644 --- a/src/compas/datastructures/mesh/subdivision.py +++ b/src/compas/datastructures/mesh/subdivision.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from copy import deepcopy from math import cos from math import pi diff --git a/src/compas/datastructures/tree/hashtree.py b/src/compas/datastructures/tree/hashtree.py index cff4002c1a93..97611d94bf93 100644 --- a/src/compas/datastructures/tree/hashtree.py +++ b/src/compas/datastructures/tree/hashtree.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import hashlib from compas.data import Data diff --git a/src/compas/datastructures/tree/tree.py b/src/compas/datastructures/tree/tree.py index f8bb56a3e574..ec1fa8619364 100644 --- a/src/compas/datastructures/tree/tree.py +++ b/src/compas/datastructures/tree/tree.py @@ -1,9 +1,3 @@ -# -*- coding: utf-8 -*- - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.data import Data from compas.datastructures import Datastructure diff --git a/src/compas/datastructures/volmesh/volmesh.py b/src/compas/datastructures/volmesh/volmesh.py index 247ea7ae8118..5fcc0383a569 100644 --- a/src/compas/datastructures/volmesh/volmesh.py +++ b/src/compas/datastructures/volmesh/volmesh.py @@ -1,17 +1,7 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - +from collections.abc import Mapping from itertools import product from random import sample -import compas - -if compas.PY2: - from collections import Mapping # type: ignore -else: - from collections.abc import Mapping - from compas.datastructures import Mesh from compas.datastructures.attributes import CellAttributeView from compas.datastructures.attributes import EdgeAttributeView diff --git a/src/compas/files/__init__.py b/src/compas/files/__init__.py index e7af9738fde0..fe80a137d5b8 100644 --- a/src/compas/files/__init__.py +++ b/src/compas/files/__init__.py @@ -1,27 +1,18 @@ """ This package defines a number of file formats and provides functionality for reading and writing data in these formats. """ +# ruff: noqa: F401 from __future__ import absolute_import from .gltf.gltf import GLTF -from .gltf.gltf_content import GLTFContent # noqa: F401 -from .gltf.gltf_exporter import GLTFExporter # noqa: F401 -from .gltf.gltf_mesh import GLTFMesh # noqa: F401 -from .gltf.gltf_parser import GLTFParser # noqa: F401 -from .gltf.gltf_reader import GLTFReader # noqa: F401 -from .obj import OBJ, OBJParser, OBJReader, OBJWriter # noqa: F401 -from .off import OFF, OFFReader, OFFWriter # noqa: F401 -from .ply import PLY, PLYParser, PLYReader, PLYWriter # noqa: F401 -from .stl import STL, STLParser, STLReader, STLWriter # noqa: F401 -from .xml import XML, XMLElement, XMLReader, XMLWriter, prettify_string # noqa: F401 - -__all__ = [ - "GLTF", - "OBJ", - "OFF", - "PLY", - "STL", - "XML", - "prettify_string", -] +from .gltf.gltf_content import GLTFContent +from .gltf.gltf_exporter import GLTFExporter +from .gltf.gltf_mesh import GLTFMesh +from .gltf.gltf_parser import GLTFParser +from .gltf.gltf_reader import GLTFReader +from .obj import OBJ, OBJParser, OBJReader, OBJWriter +from .off import OFF, OFFReader, OFFWriter +from .ply import PLY, PLYParser, PLYReader, PLYWriter +from .stl import STL, STLParser, STLReader, STLWriter +from .xml import XML, XMLElement, XMLReader, XMLWriter, prettify_string diff --git a/src/compas/files/_xml/xml_cli.py b/src/compas/files/_xml/xml_cli.py index 11c9898ae6f6..3a966c75e8db 100644 --- a/src/compas/files/_xml/xml_cli.py +++ b/src/compas/files/_xml/xml_cli.py @@ -1,5 +1,3 @@ -# -*- coding: UTF-8 -*- -# # This module has been adapted from aglyph.compat.ipyetree # # MIT license @@ -33,10 +31,6 @@ ElementTree does not exist is most releases. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import xml.etree.ElementTree as ET from urllib import addinfourl @@ -170,7 +164,7 @@ def close(self): The root element of the XML document """ xml_string = "".join(self._buffer) - self._buffer = None + self._buffer = [] reader = XmlReader.Create(StringReader(xml_string), self.settings) while reader.Read(): if reader.IsStartElement(): diff --git a/src/compas/files/_xml/xml_cpython.py b/src/compas/files/_xml/xml_cpython.py index 43a6d2c48820..84fd706b6aee 100644 --- a/src/compas/files/_xml/xml_cpython.py +++ b/src/compas/files/_xml/xml_cpython.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import xml.etree.ElementTree as ET from http.client import HTTPResponse from xml.dom import minidom diff --git a/src/compas/files/_xml/xml_pre_38.py b/src/compas/files/_xml/xml_pre_38.py index 6771edef6b88..cb30d29b3585 100644 --- a/src/compas/files/_xml/xml_pre_38.py +++ b/src/compas/files/_xml/xml_pre_38.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import xml.etree.ElementTree as ET from compas import _iotools diff --git a/src/compas/files/_xml/xml_shared.py b/src/compas/files/_xml/xml_shared.py index 6ce0ba9f70d0..3e1211ca178d 100644 --- a/src/compas/files/_xml/xml_shared.py +++ b/src/compas/files/_xml/xml_shared.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import xml.etree.ElementTree as ET from compas import _iotools diff --git a/src/compas/files/gltf/constants.py b/src/compas/files/gltf/constants.py index 7ccefd4a3ad0..5502fb292b6e 100644 --- a/src/compas/files/gltf/constants.py +++ b/src/compas/files/gltf/constants.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - COMPONENT_TYPE_BYTE = 5120 COMPONENT_TYPE_UNSIGNED_BYTE = 5121 COMPONENT_TYPE_SHORT = 5122 diff --git a/src/compas/files/gltf/data_classes.py b/src/compas/files/gltf/data_classes.py index e7d4855a0db1..72151359c645 100644 --- a/src/compas/files/gltf/data_classes.py +++ b/src/compas/files/gltf/data_classes.py @@ -1,15 +1,10 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - class AlphaMode(object): BLEND = "BLEND" MASK = "MASK" OPAQUE = "OPAQUE" -class MineType(object): +class MimeType(object): JPEG = "image/jpeg" PNG = "image/png" diff --git a/src/compas/files/gltf/gltf.py b/src/compas/files/gltf/gltf.py index 5ca2c61331d8..edcac8ebd815 100644 --- a/src/compas/files/gltf/gltf.py +++ b/src/compas/files/gltf/gltf.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.files.gltf.gltf_exporter import GLTFExporter from compas.files.gltf.gltf_parser import GLTFParser from compas.files.gltf.gltf_reader import GLTFReader diff --git a/src/compas/files/gltf/gltf_children.py b/src/compas/files/gltf/gltf_children.py index 32e3527a8a55..53fc0be94c2b 100644 --- a/src/compas/files/gltf/gltf_children.py +++ b/src/compas/files/gltf/gltf_children.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - class GLTFChildren(object): def __init__(self, context, values): self._values = list(values) diff --git a/src/compas/files/gltf/gltf_content.py b/src/compas/files/gltf/gltf_content.py index 94b655b7acf1..1365d0d27d06 100644 --- a/src/compas/files/gltf/gltf_content.py +++ b/src/compas/files/gltf/gltf_content.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.files.gltf.data_classes import TextureInfoData from compas.files.gltf.gltf_mesh import GLTFMesh from compas.files.gltf.gltf_node import GLTFNode @@ -499,7 +495,7 @@ def visit(node, key): from compas.datastructures import Mesh from compas.files.gltf.data_classes import ImageData from compas.files.gltf.data_classes import MaterialData - from compas.files.gltf.data_classes import MineType + from compas.files.gltf.data_classes import MimeType from compas.files.gltf.data_classes import PBRMetallicRoughnessData from compas.files.gltf.data_classes import TextureData from compas.files.gltf.extensions import KHR_materials_pbrSpecularGlossiness @@ -529,7 +525,7 @@ def visit(node, key): # and the gltf only makes sense when bundled with these external files. image_data = ImageData( name=image_uri, - mime_type=MineType.PNG, + mime_type=MimeType.PNG, uri=image_file, ) image_idx = cnt.add_image(image_data) diff --git a/src/compas/files/gltf/gltf_exporter.py b/src/compas/files/gltf/gltf_exporter.py index ddf5c9f4997c..51e6b9885b65 100644 --- a/src/compas/files/gltf/gltf_exporter.py +++ b/src/compas/files/gltf/gltf_exporter.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import array import base64 import json diff --git a/src/compas/files/gltf/gltf_mesh.py b/src/compas/files/gltf/gltf_mesh.py index 9a1a2635d3bd..e743c07ccb7b 100644 --- a/src/compas/files/gltf/gltf_mesh.py +++ b/src/compas/files/gltf/gltf_mesh.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import itertools from compas.files.gltf.constants import VERTEX_COUNT_BY_MODE diff --git a/src/compas/files/gltf/gltf_node.py b/src/compas/files/gltf/gltf_node.py index 23d6bee91d2c..2e7a05f7bff4 100644 --- a/src/compas/files/gltf/gltf_node.py +++ b/src/compas/files/gltf/gltf_node.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import fabs from compas.files.gltf.gltf_children import GLTFChildren diff --git a/src/compas/files/gltf/gltf_parser.py b/src/compas/files/gltf/gltf_parser.py index bb5881f148d6..c32bef886e30 100644 --- a/src/compas/files/gltf/gltf_parser.py +++ b/src/compas/files/gltf/gltf_parser.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.files.gltf.data_classes import AnimationData from compas.files.gltf.data_classes import AnimationSamplerData from compas.files.gltf.data_classes import CameraData diff --git a/src/compas/files/gltf/gltf_reader.py b/src/compas/files/gltf/gltf_reader.py index 6dd4a4a6ee2c..23c6613eca13 100644 --- a/src/compas/files/gltf/gltf_reader.py +++ b/src/compas/files/gltf/gltf_reader.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import base64 import json import os diff --git a/src/compas/files/gltf/gltf_scene.py b/src/compas/files/gltf/gltf_scene.py index cd1556d8908d..4775ffa23966 100644 --- a/src/compas/files/gltf/gltf_scene.py +++ b/src/compas/files/gltf/gltf_scene.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.files.gltf.gltf_children import GLTFChildren diff --git a/src/compas/files/gltf/helpers.py b/src/compas/files/gltf/helpers.py index 399e923b8389..4235737b91c3 100644 --- a/src/compas/files/gltf/helpers.py +++ b/src/compas/files/gltf/helpers.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import itertools import math diff --git a/src/compas/files/obj.py b/src/compas/files/obj.py index b6abd36cdac4..caeac9db9b11 100644 --- a/src/compas/files/obj.py +++ b/src/compas/files/obj.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from collections import OrderedDict from collections import defaultdict diff --git a/src/compas/files/off.py b/src/compas/files/off.py index 96b457a433c4..7ed60ab13d61 100644 --- a/src/compas/files/off.py +++ b/src/compas/files/off.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import compas from compas import _iotools diff --git a/src/compas/files/ply.py b/src/compas/files/ply.py index 286d77d41356..f49c6ff5d2ad 100644 --- a/src/compas/files/ply.py +++ b/src/compas/files/ply.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import struct import compas diff --git a/src/compas/files/stl.py b/src/compas/files/stl.py index eaf2a4b88ee7..8d921bf07bc1 100644 --- a/src/compas/files/stl.py +++ b/src/compas/files/stl.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import struct from compas import _iotools diff --git a/src/compas/files/xml.py b/src/compas/files/xml.py index aa8fc472be35..8de8764464e3 100644 --- a/src/compas/files/xml.py +++ b/src/compas/files/xml.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import sys import xml.etree.ElementTree as ET diff --git a/src/compas/geometry/__init__.py b/src/compas/geometry/__init__.py index d8d46a1591c2..25830a9f9502 100644 --- a/src/compas/geometry/__init__.py +++ b/src/compas/geometry/__init__.py @@ -3,8 +3,8 @@ It provides classes representing geometric primitives, transformations, (NURBS) curves and surfaces, shapes, general polygons and polyhedrons, boundary representations (B-reps), and a number of geometry processing algorithms. """ +# ruff: noqa: F401 -from __future__ import absolute_import import compas # ============================================================================= @@ -422,353 +422,3 @@ from .brep.face import BrepFace, SurfaceType from .brep.vertex import BrepVertex from .brep.trim import BrepTrim, BrepTrimIsoStatus - - -__all__ = [ - "Arc", - "Bezier", - "Box", - "Brep", - "BrepEdge", - "BrepError", - "BrepFace", - "BrepInvalidError", - "BrepLoop", - "BrepOrientation", - "BrepTrim", - "BrepTrimIsoStatus", - "BrepTrimmingError", - "BrepType", - "BrepFilletError", - "BrepVertex", - "Capsule", - "Circle", - "Cone", - "ConicalSurface", - "Curve", - "CurveType", - "Cylinder", - "CylindricalSurface", - "Ellipse", - "Frame", - "Geometry", - "Hyperbola", - "KDTree", - "Line", - "NurbsCurve", - "NurbsSurface", - "Parabola", - "PlanarSurface", - "Plane", - "Point", - "Pointcloud", - "Polygon", - "Polyhedron", - "Polyline", - "Projection", - "Quaternion", - "Reflection", - "Rotation", - "Scale", - "Shape", - "Shear", - "Sphere", - "SphericalSurface", - "Surface", - "SurfaceType", - "ToroidalSurface", - "Torus", - "Transformation", - "Translation", - "Vector", - "add_vectors", - "add_vectors_xy", - "allclose", - "angle_planes", - "angle_points", - "angle_points_xy", - "angle_vectors", - "angle_vectors_signed", - "angle_vectors_projected", - "angle_vectors_xy", - "angles_points", - "angles_points_xy", - "angles_vectors", - "angles_vectors_xy", - "area_polygon", - "area_polygon_xy", - "area_triangle", - "area_triangle_xy", - "argmax", - "argmin", - "axis_and_angle_from_matrix", - "axis_angle_from_quaternion", - "axis_angle_vector_from_matrix", - "barycentric_coordinates", - "basis_vectors_from_matrix", - "bestfit_plane", - "boolean_difference_mesh_mesh", - "boolean_difference_polygon_polygon", - "boolean_intersection_mesh_mesh", - "boolean_intersection_polygon_polygon", - "boolean_symmetric_difference_polygon_polygon", - "boolean_union_mesh_mesh", - "boolean_union_polygon_polygon", - "bounding_box", - "bounding_box_xy", - "centroid_points", - "centroid_points_weighted", - "centroid_points_xy", - "centroid_polygon", - "centroid_polygon_edges", - "centroid_polygon_edges_xy", - "centroid_polygon_vertices", - "centroid_polygon_vertices_xy", - "centroid_polygon_xy", - "centroid_polyhedron", - "close", - "closest_line_to_point", - "closest_point_in_cloud", - "closest_point_in_cloud_xy", - "closest_point_on_line", - "closest_point_on_line_xy", - "closest_point_on_plane", - "closest_point_on_polygon_xy", - "closest_point_on_polyline", - "closest_point_on_polyline_xy", - "closest_point_on_segment", - "closest_point_on_segment_xy", - "compose_matrix", - "compute_basisfuncs", - "compute_basisfuncsderivs", - "conforming_delaunay_triangulation", - "constrained_delaunay_triangulation", - "construct_knotvector", - "convex_hull", - "convex_hull_xy", - "cross_vectors", - "cross_vectors_xy", - "decompose_matrix", - "dehomogenize_vectors", - "delaunay_triangulation", - "discrete_coons_patch", - "distance_line_line", - "distance_point_line", - "distance_point_line_sqrd", - "distance_point_line_sqrd_xy", - "distance_point_line_xy", - "distance_point_plane", - "distance_point_plane_signed", - "distance_point_point", - "distance_point_point_sqrd", - "distance_point_point_sqrd_xy", - "distance_point_point_xy", - "divide_vectors", - "divide_vectors_xy", - "dot_vectors", - "dot_vectors_xy", - "earclip_polygon", - "euler_angles_from_matrix", - "euler_angles_from_quaternion", - "find_span", - "homogenize_vectors", - "identity_matrix", - "intersection_circle_circle_xy", - "intersection_ellipse_line_xy", - "intersection_line_box_xy", - "intersection_line_line", - "intersection_line_line_xy", - "intersection_line_plane", - "intersection_line_segment", - "intersection_line_segment_xy", - "intersection_line_triangle", - "intersection_mesh_mesh", - "intersection_plane_circle", - "intersection_plane_plane", - "intersection_plane_plane_plane", - "intersection_polyline_box_xy", - "intersection_polyline_plane", - "intersection_ray_mesh", - "intersection_segment_plane", - "intersection_segment_polyline", - "intersection_segment_polyline_xy", - "intersection_segment_segment", - "intersection_segment_segment_xy", - "intersection_sphere_line", - "intersection_sphere_sphere", - "is_ccw_xy", - "is_colinear", - "is_colinear_line_line", - "is_colinear_xy", - "is_coplanar", - "is_matrix_square", - "is_parallel_line_line", - "is_parallel_vector_vector", - "is_point_behind_plane", - "is_point_in_circle", - "is_point_in_circle_xy", - "is_point_in_convex_polygon_xy", - "is_point_in_polygon_xy", - "is_point_in_polyhedron", - "is_point_in_triangle", - "is_point_in_triangle_xy", - "is_point_infrontof_plane", - "is_point_on_line", - "is_point_on_line_xy", - "is_point_on_plane", - "is_point_on_polyline", - "is_point_on_polyline_xy", - "is_point_on_segment", - "is_point_on_segment_xy", - "is_polygon_convex", - "is_polygon_convex_xy", - "is_polygon_in_polygon_xy", - "knots_and_mults_to_knotvector", - "knotvector_to_knots_and_mults", - "length_vector", - "length_vector_sqrd", - "length_vector_sqrd_xy", - "length_vector_xy", - "local_axes", - "local_to_world_coordinates", - "matrix_determinant", - "matrix_from_axis_and_angle", - "matrix_from_axis_angle_vector", - "matrix_from_basis_vectors", - "matrix_from_change_of_basis", - "matrix_from_euler_angles", - "matrix_from_frame", - "matrix_from_frame_to_frame", - "matrix_from_orthogonal_projection", - "matrix_from_parallel_projection", - "matrix_from_perspective_entries", - "matrix_from_perspective_projection", - "matrix_from_quaternion", - "matrix_from_scale_factors", - "matrix_from_shear", - "matrix_from_shear_entries", - "matrix_from_translation", - "matrix_inverse", - "matrix_minor", - "midpoint_line", - "midpoint_line_xy", - "midpoint_point_point", - "midpoint_point_point_xy", - "mirror_point_plane", - "mirror_points_line", - "mirror_points_line_xy", - "mirror_points_plane", - "mirror_points_point", - "mirror_points_point_xy", - "mirror_vector_vector", - "multiply_matrices", - "multiply_matrix_vector", - "multiply_vectors", - "multiply_vectors_xy", - "norm_vector", - "norm_vectors", - "normal_polygon", - "normal_triangle", - "normal_triangle_xy", - "normalize_vector", - "normalize_vector_xy", - "normalize_vectors", - "normalize_vectors_xy", - "offset_line", - "offset_polygon", - "offset_polyline", - "orient_points", - "oriented_bounding_box", - "orthonormalize_axes", - "orthonormalize_vectors", - "pca_numpy", - "power_vector", - "power_vectors", - "project_point_line", - "project_point_line_xy", - "project_point_plane", - "project_points_line", - "project_points_line_xy", - "project_points_plane", - "quadmesh_planarize", - "quaternion_canonize", - "quaternion_conjugate", - "quaternion_from_axis_angle", - "quaternion_from_euler_angles", - "quaternion_from_matrix", - "quaternion_is_unit", - "quaternion_multiply", - "quaternion_norm", - "quaternion_unitize", - "reflect_line_plane", - "reflect_line_triangle", - "rotate_points", - "rotate_points_xy", - "scale_points", - "scale_points_xy", - "scale_vector", - "scale_vector_xy", - "scale_vectors", - "scale_vectors_xy", - "sort_points", - "sort_points_xy", - "square_vector", - "square_vectors", - "subtract_vectors", - "subtract_vectors_xy", - "sum_vectors", - "tangent_points_to_circle_xy", - "transform_frames", - "transform_points", - "transform_vectors", - "translate_points", - "translate_points_xy", - "translation_from_matrix", - "transpose_matrix", - "trimesh_gaussian_curvature", - "trimesh_geodistance", - "trimesh_harmonic", - "trimesh_isolines", - "trimesh_lscm", - "trimesh_massmatrix", - "trimesh_mean_curvature", - "trimesh_principal_curvature", - "trimesh_remesh", - "trimesh_remesh_along_isoline", - "trimesh_remesh_constrained", - "trimesh_slice", - "tween_points", - "tween_points_distance", - "vector_average", - "vector_component", - "vector_component_xy", - "vector_standard_deviation", - "vector_variance", - "volume_polyhedron", - "world_to_local_coordinates", -] - -if not compas.IPY: - __all__ += [ - "bestfit_circle_numpy", - "bestfit_frame_numpy", - "bestfit_line_numpy", - "bestfit_plane_numpy", - "bestfit_sphere_numpy", - "closest_points_in_cloud_numpy", - "convex_hull_numpy", - "convex_hull_xy_numpy", - "dehomogenize_and_unflatten_frames_numpy", - "dehomogenize_numpy", - "homogenize_and_flatten_frames_numpy", - "homogenize_numpy", - "icp_numpy", - "local_to_world_coordinates_numpy", - "oriented_bounding_box_numpy", - "oriented_bounding_box_xy_numpy", - "transform_points_numpy", - "transform_vectors_numpy", - "trimesh_descent_numpy", - "trimesh_gradient_numpy", - "world_to_local_coordinates_numpy", - ] diff --git a/src/compas/geometry/_core/_algebra.py b/src/compas/geometry/_core/_algebra.py index 902bd29bf724..2396a91de187 100644 --- a/src/compas/geometry/_core/_algebra.py +++ b/src/compas/geometry/_core/_algebra.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from copy import deepcopy from math import acos from math import asin diff --git a/src/compas/geometry/_core/angles.py b/src/compas/geometry/_core/angles.py index c10835d08c9f..7c331feec30d 100644 --- a/src/compas/geometry/_core/angles.py +++ b/src/compas/geometry/_core/angles.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import acos from math import degrees from math import pi diff --git a/src/compas/geometry/_core/centroids.py b/src/compas/geometry/_core/centroids.py index 41cf250ce203..bbd78cb873da 100644 --- a/src/compas/geometry/_core/centroids.py +++ b/src/compas/geometry/_core/centroids.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import fabs from compas.itertools import pairwise diff --git a/src/compas/geometry/_core/distance.py b/src/compas/geometry/_core/distance.py index 6fa1a1e9bc84..c02175d9bbc1 100644 --- a/src/compas/geometry/_core/distance.py +++ b/src/compas/geometry/_core/distance.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import fabs from math import sqrt diff --git a/src/compas/geometry/_core/normals.py b/src/compas/geometry/_core/normals.py index 6c62f9d7894a..14f4e241ab4a 100644 --- a/src/compas/geometry/_core/normals.py +++ b/src/compas/geometry/_core/normals.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from ._algebra import cross_vectors from ._algebra import cross_vectors_xy from ._algebra import length_vector diff --git a/src/compas/geometry/_core/predicates_2.py b/src/compas/geometry/_core/predicates_2.py index 339851d7c755..b705209130ac 100644 --- a/src/compas/geometry/_core/predicates_2.py +++ b/src/compas/geometry/_core/predicates_2.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import closest_point_on_segment_xy from compas.geometry import distance_point_line_xy from compas.geometry import distance_point_point_xy diff --git a/src/compas/geometry/_core/predicates_3.py b/src/compas/geometry/_core/predicates_3.py index 4e7eb851c5ed..2ba51301e0d9 100644 --- a/src/compas/geometry/_core/predicates_3.py +++ b/src/compas/geometry/_core/predicates_3.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import area_triangle from compas.geometry import centroid_points from compas.geometry import closest_point_on_segment diff --git a/src/compas/geometry/_core/size.py b/src/compas/geometry/_core/size.py index b7370590383f..b88a4e2c4e96 100644 --- a/src/compas/geometry/_core/size.py +++ b/src/compas/geometry/_core/size.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import fabs from compas.itertools import pairwise diff --git a/src/compas/geometry/_core/tangent.py b/src/compas/geometry/_core/tangent.py index 9e45db1f06f0..478d61d2b750 100644 --- a/src/compas/geometry/_core/tangent.py +++ b/src/compas/geometry/_core/tangent.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import sqrt diff --git a/src/compas/geometry/_core/transformations.py b/src/compas/geometry/_core/transformations.py index 0e0080e0ddb1..3738b3021299 100644 --- a/src/compas/geometry/_core/transformations.py +++ b/src/compas/geometry/_core/transformations.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import math from ._algebra import add_vectors diff --git a/src/compas/geometry/bbox.py b/src/compas/geometry/bbox.py index 232f821176e5..b7af2ce3f02e 100644 --- a/src/compas/geometry/bbox.py +++ b/src/compas/geometry/bbox.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from itertools import islice from compas.plugins import pluggable diff --git a/src/compas/geometry/bestfit.py b/src/compas/geometry/bestfit.py index ba4a02c538ca..805f03346cf2 100644 --- a/src/compas/geometry/bestfit.py +++ b/src/compas/geometry/bestfit.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import centroid_points from compas.geometry import normalize_vector from compas.geometry import subtract_vectors diff --git a/src/compas/geometry/booleans.py b/src/compas/geometry/booleans.py index 5ed22c70402c..83a5f2091db1 100644 --- a/src/compas/geometry/booleans.py +++ b/src/compas/geometry/booleans.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.plugins import PluginNotInstalledError from compas.plugins import pluggable diff --git a/src/compas/geometry/curves/arc.py b/src/compas/geometry/curves/arc.py index b98dac9f1f71..f0c7cb5f93bc 100644 --- a/src/compas/geometry/curves/arc.py +++ b/src/compas/geometry/curves/arc.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/curves/bezier.py b/src/compas/geometry/curves/bezier.py index e8c4fde34adc..e5a0d055650f 100644 --- a/src/compas/geometry/curves/bezier.py +++ b/src/compas/geometry/curves/bezier.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import factorial from compas.geometry import Frame diff --git a/src/compas/geometry/curves/circle.py b/src/compas/geometry/curves/circle.py index 60e8e60b9414..5a617414a9e8 100644 --- a/src/compas/geometry/curves/circle.py +++ b/src/compas/geometry/curves/circle.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/curves/conic.py b/src/compas/geometry/curves/conic.py index 93e6b6043545..0b8c26d0fc92 100644 --- a/src/compas/geometry/curves/conic.py +++ b/src/compas/geometry/curves/conic.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from .curve import Curve diff --git a/src/compas/geometry/curves/curve.py b/src/compas/geometry/curves/curve.py index af869d823159..803dd38627c8 100644 --- a/src/compas/geometry/curves/curve.py +++ b/src/compas/geometry/curves/curve.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Frame from compas.geometry import Geometry from compas.geometry import Plane diff --git a/src/compas/geometry/curves/ellipse.py b/src/compas/geometry/curves/ellipse.py index 2f9fa9ed43be..66e467892c2d 100644 --- a/src/compas/geometry/curves/ellipse.py +++ b/src/compas/geometry/curves/ellipse.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/curves/hyperbola.py b/src/compas/geometry/curves/hyperbola.py index ef3c952a82fb..5aee86683e5b 100644 --- a/src/compas/geometry/curves/hyperbola.py +++ b/src/compas/geometry/curves/hyperbola.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/curves/line.py b/src/compas/geometry/curves/line.py index b17799987db6..d982a63fe140 100644 --- a/src/compas/geometry/curves/line.py +++ b/src/compas/geometry/curves/line.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Frame from compas.geometry import Point from compas.geometry import Vector diff --git a/src/compas/geometry/curves/nurbs.py b/src/compas/geometry/curves/nurbs.py index cce9186974a3..9635d62c75bc 100644 --- a/src/compas/geometry/curves/nurbs.py +++ b/src/compas/geometry/curves/nurbs.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import sqrt from compas.geometry import Frame diff --git a/src/compas/geometry/curves/parabola.py b/src/compas/geometry/curves/parabola.py index c6202c9d5864..a8152c21835b 100644 --- a/src/compas/geometry/curves/parabola.py +++ b/src/compas/geometry/curves/parabola.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Frame from compas.geometry import Point from compas.geometry import Vector diff --git a/src/compas/geometry/curves/polyline.py b/src/compas/geometry/curves/polyline.py index 37303e0c8433..9a6169d63d44 100644 --- a/src/compas/geometry/curves/polyline.py +++ b/src/compas/geometry/curves/polyline.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Frame from compas.geometry import Line from compas.geometry import Point diff --git a/src/compas/geometry/frame.py b/src/compas/geometry/frame.py index bfb52f4a1ef0..21b8cc59c663 100644 --- a/src/compas/geometry/frame.py +++ b/src/compas/geometry/frame.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Geometry from compas.geometry import Transformation from compas.geometry import argmax diff --git a/src/compas/geometry/geometry.py b/src/compas/geometry/geometry.py index 4a16b2bbfbcc..d7ee8a108d5d 100644 --- a/src/compas/geometry/geometry.py +++ b/src/compas/geometry/geometry.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - try: from typing import TypeVar # noqa: F401 except ImportError: diff --git a/src/compas/geometry/hull.py b/src/compas/geometry/hull.py index 37932239f4f4..35eee205ac3e 100644 --- a/src/compas/geometry/hull.py +++ b/src/compas/geometry/hull.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import cross_vectors from compas.geometry import cross_vectors_xy from compas.geometry import dot_vectors diff --git a/src/compas/geometry/interpolation_barycentric.py b/src/compas/geometry/interpolation_barycentric.py index c6a2c64d8de6..8e7b8503414b 100644 --- a/src/compas/geometry/interpolation_barycentric.py +++ b/src/compas/geometry/interpolation_barycentric.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import dot_vectors from compas.geometry import subtract_vectors diff --git a/src/compas/geometry/interpolation_coons.py b/src/compas/geometry/interpolation_coons.py index 3e69fab28f26..a876f27b913a 100644 --- a/src/compas/geometry/interpolation_coons.py +++ b/src/compas/geometry/interpolation_coons.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import add_vectors from compas.geometry import scale_vector from compas.geometry import subtract_vectors diff --git a/src/compas/geometry/interpolation_tweening.py b/src/compas/geometry/interpolation_tweening.py index 47fbf3de0760..204cd1638db7 100644 --- a/src/compas/geometry/interpolation_tweening.py +++ b/src/compas/geometry/interpolation_tweening.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import add_vectors from compas.geometry import distance_point_point from compas.geometry import scale_vector diff --git a/src/compas/geometry/intersection.py b/src/compas/geometry/intersection.py index 6f36d311bc20..bc2500c82c49 100644 --- a/src/compas/geometry/intersection.py +++ b/src/compas/geometry/intersection.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# from compas.precision import Precision from compas.geometry import distance_point_point diff --git a/src/compas/geometry/intersections.py b/src/compas/geometry/intersections.py index 851d80ddc588..6222b165b5a4 100644 --- a/src/compas/geometry/intersections.py +++ b/src/compas/geometry/intersections.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import fabs from math import sqrt diff --git a/src/compas/geometry/kdtree.py b/src/compas/geometry/kdtree.py index 10457ba78042..b7c94b082645 100644 --- a/src/compas/geometry/kdtree.py +++ b/src/compas/geometry/kdtree.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import collections from ._core.distance import distance_point_point_sqrd diff --git a/src/compas/geometry/offset.py b/src/compas/geometry/offset.py index b41c093ca879..770e79602aa2 100644 --- a/src/compas/geometry/offset.py +++ b/src/compas/geometry/offset.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.data.validators import is_item_iterable from compas.geometry import add_vectors from compas.geometry import centroid_points diff --git a/src/compas/geometry/plane.py b/src/compas/geometry/plane.py index ac6fefa7978d..fb4d1a25192c 100644 --- a/src/compas/geometry/plane.py +++ b/src/compas/geometry/plane.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import sqrt from compas.geometry import Geometry diff --git a/src/compas/geometry/point.py b/src/compas/geometry/point.py index 4f8a1e828794..2390082e721c 100644 --- a/src/compas/geometry/point.py +++ b/src/compas/geometry/point.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import centroid_points from compas.geometry import distance_point_line from compas.geometry import distance_point_plane diff --git a/src/compas/geometry/pointcloud.py b/src/compas/geometry/pointcloud.py index db971cfaf5b7..1b723188561a 100644 --- a/src/compas/geometry/pointcloud.py +++ b/src/compas/geometry/pointcloud.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from random import uniform from compas.geometry import Geometry diff --git a/src/compas/geometry/polygon.py b/src/compas/geometry/polygon.py index 9feffed84f0c..e89e153bcdf2 100644 --- a/src/compas/geometry/polygon.py +++ b/src/compas/geometry/polygon.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import math from compas.geometry import Frame diff --git a/src/compas/geometry/polyhedron.py b/src/compas/geometry/polyhedron.py index 68720119daa3..e391c3091653 100644 --- a/src/compas/geometry/polyhedron.py +++ b/src/compas/geometry/polyhedron.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import sqrt from compas.geometry import Line diff --git a/src/compas/geometry/quadmesh_planarize.py b/src/compas/geometry/quadmesh_planarize.py index 5d2084762bc7..1224f75aa57f 100644 --- a/src/compas/geometry/quadmesh_planarize.py +++ b/src/compas/geometry/quadmesh_planarize.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.plugins import pluggable diff --git a/src/compas/geometry/quadmesh_planarize_none.py b/src/compas/geometry/quadmesh_planarize_none.py index 92487087aa3b..9c6c50cb48ca 100644 --- a/src/compas/geometry/quadmesh_planarize_none.py +++ b/src/compas/geometry/quadmesh_planarize_none.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import bestfit_plane from compas.geometry import centroid_points from compas.geometry import distance_line_line diff --git a/src/compas/geometry/quaternion.py b/src/compas/geometry/quaternion.py index 19d5d452003c..83efbca1cc53 100644 --- a/src/compas/geometry/quaternion.py +++ b/src/compas/geometry/quaternion.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import math from sys import float_info diff --git a/src/compas/geometry/shapes/box.py b/src/compas/geometry/shapes/box.py index f1f354b5253b..d626438ecde0 100644 --- a/src/compas/geometry/shapes/box.py +++ b/src/compas/geometry/shapes/box.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Frame from compas.geometry import Line from compas.geometry import Point # noqa: F401 diff --git a/src/compas/geometry/shapes/capsule.py b/src/compas/geometry/shapes/capsule.py index 8ba87f97cd4c..840d738e2f94 100644 --- a/src/compas/geometry/shapes/capsule.py +++ b/src/compas/geometry/shapes/capsule.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/shapes/cone.py b/src/compas/geometry/shapes/cone.py index 48fd50d1a45e..6b6c93bbaea1 100644 --- a/src/compas/geometry/shapes/cone.py +++ b/src/compas/geometry/shapes/cone.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/shapes/cylinder.py b/src/compas/geometry/shapes/cylinder.py index 29857a3743e2..5cd3b657dce8 100644 --- a/src/compas/geometry/shapes/cylinder.py +++ b/src/compas/geometry/shapes/cylinder.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/shapes/shape.py b/src/compas/geometry/shapes/shape.py index 693d96df0ea4..02461810a497 100644 --- a/src/compas/geometry/shapes/shape.py +++ b/src/compas/geometry/shapes/shape.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import compas # noqa: F401 from compas.geometry import Frame from compas.geometry import Geometry diff --git a/src/compas/geometry/shapes/sphere.py b/src/compas/geometry/shapes/sphere.py index 19007ba954bd..e6e3556bbc39 100644 --- a/src/compas/geometry/shapes/sphere.py +++ b/src/compas/geometry/shapes/sphere.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/shapes/torus.py b/src/compas/geometry/shapes/torus.py index b2f7ac3908d4..e9f0a53697c4 100644 --- a/src/compas/geometry/shapes/torus.py +++ b/src/compas/geometry/shapes/torus.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin @@ -294,4 +290,3 @@ def scale(self, factor): """ self.radius_axis *= factor self.radius_pipe *= factor - diff --git a/src/compas/geometry/surfaces/conical.py b/src/compas/geometry/surfaces/conical.py index 0bcda369aad7..c7071f7c7d75 100644 --- a/src/compas/geometry/surfaces/conical.py +++ b/src/compas/geometry/surfaces/conical.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/surfaces/cylindrical.py b/src/compas/geometry/surfaces/cylindrical.py index 0be9f8aac4b5..367c61aefd73 100644 --- a/src/compas/geometry/surfaces/cylindrical.py +++ b/src/compas/geometry/surfaces/cylindrical.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/surfaces/nurbs.py b/src/compas/geometry/surfaces/nurbs.py index 2120e935f614..a6832008529d 100644 --- a/src/compas/geometry/surfaces/nurbs.py +++ b/src/compas/geometry/surfaces/nurbs.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Point from compas.itertools import linspace from compas.itertools import meshgrid diff --git a/src/compas/geometry/surfaces/planar.py b/src/compas/geometry/surfaces/planar.py index 4b6797444f0b..3fc526bd7e37 100644 --- a/src/compas/geometry/surfaces/planar.py +++ b/src/compas/geometry/surfaces/planar.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Frame from compas.geometry import Plane from compas.geometry import Point diff --git a/src/compas/geometry/surfaces/spherical.py b/src/compas/geometry/surfaces/spherical.py index c1086a035877..cf7c9b416a68 100644 --- a/src/compas/geometry/surfaces/spherical.py +++ b/src/compas/geometry/surfaces/spherical.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/surfaces/surface.py b/src/compas/geometry/surfaces/surface.py index 1cca7126065b..23f0c458d130 100644 --- a/src/compas/geometry/surfaces/surface.py +++ b/src/compas/geometry/surfaces/surface.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from itertools import product from compas.geometry import Frame diff --git a/src/compas/geometry/surfaces/toroidal.py b/src/compas/geometry/surfaces/toroidal.py index d239749a5394..121a010bd690 100644 --- a/src/compas/geometry/surfaces/toroidal.py +++ b/src/compas/geometry/surfaces/toroidal.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import cos from math import pi from math import sin diff --git a/src/compas/geometry/trimesh_curvature.py b/src/compas/geometry/trimesh_curvature.py index 56a79ef3ef95..0a9249e06a36 100644 --- a/src/compas/geometry/trimesh_curvature.py +++ b/src/compas/geometry/trimesh_curvature.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import pi from compas.geometry import angle_points diff --git a/src/compas/geometry/trimesh_isolines.py b/src/compas/geometry/trimesh_isolines.py index 0c8151e7001f..8d8551fc3127 100644 --- a/src/compas/geometry/trimesh_isolines.py +++ b/src/compas/geometry/trimesh_isolines.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.plugins import pluggable diff --git a/src/compas/geometry/trimesh_matrices.py b/src/compas/geometry/trimesh_matrices.py index 49413a1a3887..e51e34ebf249 100644 --- a/src/compas/geometry/trimesh_matrices.py +++ b/src/compas/geometry/trimesh_matrices.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.plugins import pluggable diff --git a/src/compas/geometry/trimesh_parametrisation.py b/src/compas/geometry/trimesh_parametrisation.py index 336b5b622b6c..62dace0d27a1 100644 --- a/src/compas/geometry/trimesh_parametrisation.py +++ b/src/compas/geometry/trimesh_parametrisation.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.plugins import pluggable diff --git a/src/compas/geometry/trimesh_slicing.py b/src/compas/geometry/trimesh_slicing.py index f1e9b114370a..904c4500d943 100644 --- a/src/compas/geometry/trimesh_slicing.py +++ b/src/compas/geometry/trimesh_slicing.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.plugins import pluggable diff --git a/src/compas/geometry/vector.py b/src/compas/geometry/vector.py index 135710b48aa6..deb52bf2bb41 100644 --- a/src/compas/geometry/vector.py +++ b/src/compas/geometry/vector.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import Geometry from compas.geometry import angle_vectors from compas.geometry import angle_vectors_signed diff --git a/src/compas/itertools.py b/src/compas/itertools.py index 5c0a4fa6d625..d6216fab66f8 100644 --- a/src/compas/itertools.py +++ b/src/compas/itertools.py @@ -1,8 +1,5 @@ # recipes with itertools # see: https://docs.python.org/3.6/library/itertools.html -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from functools import reduce from itertools import chain @@ -16,18 +13,6 @@ except ImportError: from itertools import izip_longest as zip_longest # type: ignore -__all__ = [ - "normalize_values", - "remap_values", - "meshgrid", - "linspace", - "flatten", - "reshape", - "pairwise", - "window", - "iterable_like", -] - def normalize_values(values, new_min=0.0, new_max=1.0): """Normalize a list of numbers to the range between new_min and new_max. diff --git a/src/compas/rpc/__init__.py b/src/compas/rpc/__init__.py index c34107367d59..d770abac96b1 100644 --- a/src/compas/rpc/__init__.py +++ b/src/compas/rpc/__init__.py @@ -8,13 +8,9 @@ A typical use case is to run algorithms that require packages like ``numpy`` or ``scipy`` on a remote server, when working in Rhino. Or to use COMPAS in a browser application. """ - -from __future__ import absolute_import +# ruff: noqa: F401 from .errors import RPCClientError, RPCServerError from .proxy import Proxy from .server import Server from .dispatcher import Dispatcher - - -__all__ = ["RPCClientError", "RPCServerError", "Proxy", "Server", "Dispatcher"] diff --git a/src/compas/rpc/dispatcher.py b/src/compas/rpc/dispatcher.py index ef0853833632..695a60d2792e 100644 --- a/src/compas/rpc/dispatcher.py +++ b/src/compas/rpc/dispatcher.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import importlib import json import pstats diff --git a/src/compas/rpc/errors.py b/src/compas/rpc/errors.py index 89d37f6881b0..f23f85931020 100644 --- a/src/compas/rpc/errors.py +++ b/src/compas/rpc/errors.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - class RPCServerError(Exception): """Exception for errors originating from the server.""" diff --git a/src/compas/rpc/proxy.py b/src/compas/rpc/proxy.py index 474bc40d0007..008d73219388 100644 --- a/src/compas/rpc/proxy.py +++ b/src/compas/rpc/proxy.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import json import time diff --git a/src/compas/rpc/server.py b/src/compas/rpc/server.py index e570f0f437a0..d4b162a0cd55 100644 --- a/src/compas/rpc/server.py +++ b/src/compas/rpc/server.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import threading try: diff --git a/src/compas/scene/__init__.py b/src/compas/scene/__init__.py index 8aaa2c03581d..9ffb790f1379 100644 --- a/src/compas/scene/__init__.py +++ b/src/compas/scene/__init__.py @@ -3,10 +3,7 @@ Every item type is paired with a corresponding scene object type that is capable of visualizing the data of the object. The scene objects are implemented as pluggables, and automatically switch between plugins depending on the contexct in which they are used. """ - -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division +# ruff: noqa: F401 from .exceptions import SceneObjectNotRegisteredError from .sceneobject import SceneObject @@ -38,21 +35,3 @@ def register_scene_objects_base(): register(Mesh, MeshObject, context=None) register(Graph, GraphObject, context=None) register(VolMesh, VolMeshObject, context=None) - - -__all__ = [ - "SceneObjectNotRegisteredError", - "SceneObject", - "MeshObject", - "GraphObject", - "GeometryObject", - "VolMeshObject", - "Scene", - "clear", - "before_draw", - "after_draw", - "register_scene_objects", - "get_sceneobject_cls", - "register", - "Group", -] diff --git a/src/compas/scene/descriptors/colordict.py b/src/compas/scene/descriptors/colordict.py index 03a6db90a695..41f841a34395 100644 --- a/src/compas/scene/descriptors/colordict.py +++ b/src/compas/scene/descriptors/colordict.py @@ -1,9 +1,5 @@ -import compas +from collections.abc import Mapping -if compas.PY2: - from collections import Mapping -else: - from collections.abc import Mapping from compas.colors.colordict import ColorDict diff --git a/src/compas/scene/descriptors/protocol.py b/src/compas/scene/descriptors/protocol.py index b7a20ad42836..a27da4322a2d 100644 --- a/src/compas/scene/descriptors/protocol.py +++ b/src/compas/scene/descriptors/protocol.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - class DescriptorProtocol(type): """Meta class to provide support for the descriptor protocol in Python versions lower than 3.6""" diff --git a/src/compas/scene/exceptions.py b/src/compas/scene/exceptions.py index 6b9882e324e2..4851a67fe14d 100644 --- a/src/compas/scene/exceptions.py +++ b/src/compas/scene/exceptions.py @@ -1,7 +1,2 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - class SceneObjectNotRegisteredError(Exception): """Exception that is raised when no scene object is registered for a given data type.""" diff --git a/src/compas/scene/geometryobject.py b/src/compas/scene/geometryobject.py index b8af998d2de2..fc2f9dcb54da 100644 --- a/src/compas/scene/geometryobject.py +++ b/src/compas/scene/geometryobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import compas.colors # noqa: F401 import compas.geometry # noqa: F401 diff --git a/src/compas/scene/graphobject.py b/src/compas/scene/graphobject.py index 866cdd668c83..356943a9cac9 100644 --- a/src/compas/scene/graphobject.py +++ b/src/compas/scene/graphobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import compas.colors # noqa: F401 import compas.datastructures # noqa: F401 import compas.geometry # noqa: F401 diff --git a/src/compas/scene/group.py b/src/compas/scene/group.py index a440e62f9d07..d14c3364c936 100644 --- a/src/compas/scene/group.py +++ b/src/compas/scene/group.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import compas.data # noqa: F401 from .sceneobject import SceneObject diff --git a/src/compas/scene/meshobject.py b/src/compas/scene/meshobject.py index 9c51e072d53d..686e2af73751 100644 --- a/src/compas/scene/meshobject.py +++ b/src/compas/scene/meshobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import compas.colors # noqa: F401 import compas.datastructures # noqa: F401 import compas.geometry # noqa: F401 diff --git a/src/compas/scene/sceneobject.py b/src/compas/scene/sceneobject.py index f227b43e5ac5..2d0648d61fbd 100644 --- a/src/compas/scene/sceneobject.py +++ b/src/compas/scene/sceneobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from functools import reduce from operator import mul diff --git a/src/compas/scene/volmeshobject.py b/src/compas/scene/volmeshobject.py index 5b391cb4188a..1879cecb291e 100644 --- a/src/compas/scene/volmeshobject.py +++ b/src/compas/scene/volmeshobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import compas.colors # noqa: F401 import compas.datastructures # noqa: F401 import compas.geometry # noqa: F401 diff --git a/src/compas/tolerance.py b/src/compas/tolerance.py index 5fe4cdb1048c..124cce73ce26 100644 --- a/src/compas/tolerance.py +++ b/src/compas/tolerance.py @@ -28,10 +28,6 @@ """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from contextlib import contextmanager from decimal import Decimal from warnings import warn @@ -39,8 +35,6 @@ import compas from compas.data import Data -__all__ = ["Tolerance", "TOL"] - class Tolerance(Data): """Tolerance settings for geometric operations. diff --git a/src/compas/topology/__init__.py b/src/compas/topology/__init__.py index 747858736961..ada722e5acb7 100644 --- a/src/compas/topology/__init__.py +++ b/src/compas/topology/__init__.py @@ -1,8 +1,7 @@ """ Package containing topological algorithms for traversal, connectivity, combinatorics, etc. """ - -from __future__ import absolute_import +# ruff: noqa: F401 from .traversal import ( depth_first_ordering, @@ -23,23 +22,3 @@ edges_from_faces, faces_from_edges, ) - -__all__ = [ - "astar_lightest_path", - "astar_shortest_path", - "breadth_first_ordering", - "breadth_first_traverse", - "breadth_first_paths", - "connected_components", - "depth_first_ordering", - "dijkstra_distances", - "dijkstra_path", - "edges_from_faces", - "face_adjacency", - "faces_from_edges", - "shortest_path", - "unify_cycles", - "vertex_adjacency_from_edges", - "vertex_adjacency_from_faces", - "vertex_coloring", -] diff --git a/src/compas/topology/combinatorics.py b/src/compas/topology/combinatorics.py index dff34e6d4220..f1551917f0d6 100644 --- a/src/compas/topology/combinatorics.py +++ b/src/compas/topology/combinatorics.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from collections import deque from compas.topology.traversal import breadth_first_traverse diff --git a/src/compas/topology/connectivity.py b/src/compas/topology/connectivity.py index f271290c7149..263e6e5f77c8 100644 --- a/src/compas/topology/connectivity.py +++ b/src/compas/topology/connectivity.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.itertools import pairwise diff --git a/src/compas/topology/orientation.py b/src/compas/topology/orientation.py index 72da1b21e363..6b1b7567c8b1 100644 --- a/src/compas/topology/orientation.py +++ b/src/compas/topology/orientation.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import centroid_points from compas.itertools import pairwise from compas.topology import breadth_first_traverse diff --git a/src/compas/topology/traversal.py b/src/compas/topology/traversal.py index d185d4301307..3fab11f634ea 100644 --- a/src/compas/topology/traversal.py +++ b/src/compas/topology/traversal.py @@ -1,13 +1,5 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -try: - from queue import PriorityQueue -except ImportError: - from Queue import PriorityQueue # type: ignore - from collections import deque +from queue import PriorityQueue from compas.geometry import distance_point_point diff --git a/src/compas/utilities/__init__.py b/src/compas/utilities/__init__.py index 2b926960a1af..d066bfc92ccc 100644 --- a/src/compas/utilities/__init__.py +++ b/src/compas/utilities/__init__.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +# ruff: noqa: F401 from .azync import await_callback from .datetime import now, timestamp @@ -11,15 +11,3 @@ from .remote import download_file_from_remote from .ssh import SSH - -__all__ = [ - "await_callback", - "timestamp", - "now", - "abstractstaticmethod", - "abstractclassmethod", - "memoize", - "print_profile", - "download_file_from_remote", - "SSH", -] diff --git a/src/compas/utilities/azync.py b/src/compas/utilities/azync.py index 147cd50cb240..49eb1850cf42 100644 --- a/src/compas/utilities/azync.py +++ b/src/compas/utilities/azync.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import sys import threading diff --git a/src/compas/utilities/datetime.py b/src/compas/utilities/datetime.py index 372236cdedf2..ab815c7b572d 100644 --- a/src/compas/utilities/datetime.py +++ b/src/compas/utilities/datetime.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import datetime import time diff --git a/src/compas/utilities/decorators.py b/src/compas/utilities/decorators.py index b39bf31df553..dea771bd3462 100644 --- a/src/compas/utilities/decorators.py +++ b/src/compas/utilities/decorators.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import functools import pstats from functools import wraps diff --git a/src/compas/utilities/remote.py b/src/compas/utilities/remote.py index c8ec7eddbd28..25c59fb9362e 100644 --- a/src/compas/utilities/remote.py +++ b/src/compas/utilities/remote.py @@ -1,13 +1,5 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import os - -try: - from urllib.request import urlretrieve -except ImportError: - from urllib import urlretrieve +from urllib.request import urlretrieve def download_file_from_remote(source, target, overwrite=True): diff --git a/src/compas/utilities/ssh.py b/src/compas/utilities/ssh.py index 8ae61721185b..bd62af20c5e5 100644 --- a/src/compas/utilities/ssh.py +++ b/src/compas/utilities/ssh.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - try: from paramiko import AutoAddPolicy from paramiko import SSHClient diff --git a/src/compas_blender/__init__.py b/src/compas_blender/__init__.py index 935d6abe545b..ad890576c317 100644 --- a/src/compas_blender/__init__.py +++ b/src/compas_blender/__init__.py @@ -20,15 +20,6 @@ INSTALLATION_ARGUMENTS = None - -__all__ = [ - "INSTALLABLE_PACKAGES", - "SUPPORTED_VERSIONS", - "DEFAULT_VERSION", - "clear", - "redraw", -] - __all_plugins__ = [ "compas_blender.geometry.booleans", "compas_blender.install", diff --git a/src/compas_ghpython/__init__.py b/src/compas_ghpython/__init__.py index c9aa9ea301c0..bc67b86724a9 100644 --- a/src/compas_ghpython/__init__.py +++ b/src/compas_ghpython/__init__.py @@ -16,17 +16,6 @@ __version__ = "2.15.0" -__all__ = [ - "get_grasshopper_managedplugin_path", - "get_grasshopper_library_path", - "get_grasshopper_userobjects_path", - "fetch_ghio_lib", - "create_id", - "warning", - "error", - "remark", - "message", -] __all_plugins__ = [ "compas_ghpython.install", "compas_ghpython.uninstall", diff --git a/src/compas_ghpython/scene/__init__.py b/src/compas_ghpython/scene/__init__.py index 536a675c47b5..80b5014730c4 100644 --- a/src/compas_ghpython/scene/__init__.py +++ b/src/compas_ghpython/scene/__init__.py @@ -2,8 +2,7 @@ This package provides scene object plugins for visualising COMPAS objects in Grasshopper. When working in GH Python components, :class:`compas.scene.SceneObject` will automatically use the corresponding GHPython scene object for each COMPAS object type. """ - -from __future__ import absolute_import +# ruff: noqa: F401 from compas.plugins import plugin from compas.scene import register @@ -88,29 +87,3 @@ def register_scene_objects(): register(Brep, BrepObject, context="Grasshopper") print("GH SceneObjects registered.") - - -__all__ = [ - "GHSceneObject", - "BoxObject", - "CapsuleObject", - "CircleObject", - "ConeObject", - "CurveObject", - "CylinderObject", - "EllipseObject", - "FrameObject", - "LineObject", - "MeshObject", - "GraphObject", - "PlaneObject", - "PointObject", - "PolygonObject", - "PolyhedronObject", - "PolylineObject", - "SphereObject", - "SurfaceObject", - "TorusObject", - "VectorObject", - "VolMeshObject", -] diff --git a/src/compas_rhino/__init__.py b/src/compas_rhino/__init__.py index 7f64b6ef539b..1e0bfb51ff38 100644 --- a/src/compas_rhino/__init__.py +++ b/src/compas_rhino/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import io import os @@ -25,20 +23,6 @@ unload_modules = DevTools.unload_modules -__all__ = [ - "PURGE_ON_DELETE", - "INSTALLABLE_PACKAGES", - "SUPPORTED_VERSIONS", - "DEFAULT_VERSION", - "INSTALLED_VERSION", - "IRONPYTHON_PLUGIN_GUID", - "GRASSHOPPER_PLUGIN_GUID", - "RHINOCYCLES_PLUGIN_GUID", - "clear", - "redraw", - "unload_modules", -] - __all_plugins__ = [ "compas_rhino.geometry.booleans", "compas_rhino.geometry.trimesh_curvature", diff --git a/src/compas_rhino/conduits/__init__.py b/src/compas_rhino/conduits/__init__.py index debec314089a..6f52e1cf1f3e 100644 --- a/src/compas_rhino/conduits/__init__.py +++ b/src/compas_rhino/conduits/__init__.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +# ruff: noqa: F401 from .base import BaseConduit @@ -6,11 +6,3 @@ from .labels import LabelsConduit from .lines import LinesConduit from .points import PointsConduit - -__all__ = [ - "BaseConduit", - "FacesConduit", - "LabelsConduit", - "LinesConduit", - "PointsConduit", -] diff --git a/src/compas_rhino/conduits/base.py b/src/compas_rhino/conduits/base.py index 9a37013a1504..5571884cee9b 100644 --- a/src/compas_rhino/conduits/base.py +++ b/src/compas_rhino/conduits/base.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import time from contextlib import contextmanager diff --git a/src/compas_rhino/conduits/faces.py b/src/compas_rhino/conduits/faces.py index 2743f35f8184..36910cfdd691 100644 --- a/src/compas_rhino/conduits/faces.py +++ b/src/compas_rhino/conduits/faces.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import System # type: ignore diff --git a/src/compas_rhino/conduits/labels.py b/src/compas_rhino/conduits/labels.py index e36c17397d46..9a5f1048fc54 100644 --- a/src/compas_rhino/conduits/labels.py +++ b/src/compas_rhino/conduits/labels.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import System # type: ignore diff --git a/src/compas_rhino/conduits/lines.py b/src/compas_rhino/conduits/lines.py index 300f351f427e..49f3cdaf9f6e 100644 --- a/src/compas_rhino/conduits/lines.py +++ b/src/compas_rhino/conduits/lines.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import System # type: ignore diff --git a/src/compas_rhino/conduits/points.py b/src/compas_rhino/conduits/points.py index fe850924a5ab..377c27b5a0bd 100644 --- a/src/compas_rhino/conduits/points.py +++ b/src/compas_rhino/conduits/points.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import System # type: ignore diff --git a/src/compas_rhino/conversions/__init__.py b/src/compas_rhino/conversions/__init__.py index a80dbb921d08..045c1ceb8d81 100644 --- a/src/compas_rhino/conversions/__init__.py +++ b/src/compas_rhino/conversions/__init__.py @@ -1,8 +1,7 @@ """ This package provides functions to convert between COMPAS data/objects and Rhino data/objects. """ - -from __future__ import absolute_import +# ruff: noqa: F401 from .exceptions import ConversionError @@ -94,85 +93,3 @@ meshobject_to_compas, pointobject_to_compas, ) - - -__all__ = [ - "ConversionError", - # geometry - "point_to_rhino", - "vector_to_rhino", - "plane_to_rhino", - "frame_to_rhino", - "frame_to_rhino_plane", - "polygon_to_rhino", - "point_to_compas", - "vector_to_compas", - "plane_to_compas", - "plane_to_compas_frame", - "polygon_to_compas", - # curves - "line_to_rhino", - "line_to_rhino_curve", - "polyline_to_rhino", - "polyline_to_rhino_curve", - "circle_to_rhino", - "circle_to_rhino_curve", - "ellipse_to_rhino", - "ellipse_to_rhino_curve", - "arc_to_rhino", - "curve_to_rhino", - "line_to_compas", - "polyline_to_compas", - "circle_to_compas", - "ellipse_to_compas", - "arc_to_compas", - "curve_to_compas_circle", - "curve_to_compas_ellipse", - "curve_to_compas_line", - "curve_to_compas_polyline", - "curve_to_compas", - # surfaces - "surface_to_rhino", - "surface_to_compas", - "surface_to_compas_mesh", - # shapes - "box_to_rhino", - "sphere_to_rhino", - "capsule_to_rhino", - "capsule_to_rhino_brep", - "cone_to_rhino", - "cone_to_rhino_brep", - "cylinder_to_rhino", - "cylinder_to_rhino_brep", - "torus_to_rhino", - "torus_to_rhino_brep", - "box_to_compas", - "sphere_to_compas", - "cone_to_compas", - "cylinder_to_compas", - # meshes - "mesh_to_rhino", - "polyhedron_to_rhino", - "vertices_and_faces_to_rhino", - "mesh_to_compas", - # breps - "brep_to_rhino", - "brep_to_compas", - "brep_to_compas_box", - "brep_to_compas_cone", - "brep_to_compas_cylinder", - "brep_to_compas_sphere", - "brep_to_compas_mesh", - # extrusions - "extrusion_to_compas_box", - "extrusion_to_compas_cylinder", - "extrusion_to_compas_torus", - # transformations - "transformation_to_rhino", - "transformation_matrix_to_rhino", - # docobjects - "brepobject_to_compas", - "curveobject_to_compas", - "meshobject_to_compas", - "pointobject_to_compas", -] diff --git a/src/compas_rhino/conversions/breps.py b/src/compas_rhino/conversions/breps.py index 3be86027198b..b5894a6e56a3 100644 --- a/src/compas_rhino/conversions/breps.py +++ b/src/compas_rhino/conversions/breps.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino.Geometry # type: ignore # noqa: F401 import scriptcontext as sc # type: ignore diff --git a/src/compas_rhino/conversions/curves.py b/src/compas_rhino/conversions/curves.py index 56f50574112e..7aee29f45ca2 100644 --- a/src/compas_rhino/conversions/curves.py +++ b/src/compas_rhino/conversions/curves.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import scriptcontext as sc # type: ignore diff --git a/src/compas_rhino/conversions/docobjects.py b/src/compas_rhino/conversions/docobjects.py index a6d827a6ffcb..bf22d6d4cb5b 100644 --- a/src/compas_rhino/conversions/docobjects.py +++ b/src/compas_rhino/conversions/docobjects.py @@ -1,16 +1,11 @@ -from __future__ import absolute_import # noqa: I001 -from __future__ import division -from __future__ import print_function - import Rhino.Geometry # type: ignore # noqa: F401 import System # type: ignore import compas_rhino.objects -from .exceptions import ConversionError - from .breps import brep_to_compas from .curves import curve_to_compas +from .exceptions import ConversionError from .geometry import point_to_compas from .meshes import mesh_to_compas diff --git a/src/compas_rhino/conversions/exceptions.py b/src/compas_rhino/conversions/exceptions.py index 00fe6125e096..8a8afb4039d7 100644 --- a/src/compas_rhino/conversions/exceptions.py +++ b/src/compas_rhino/conversions/exceptions.py @@ -1,7 +1,2 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - - class ConversionError(Exception): """Raised when a conversion is not possible.""" diff --git a/src/compas_rhino/conversions/extrusions.py b/src/compas_rhino/conversions/extrusions.py index caf71dfb4482..4059b12cc558 100644 --- a/src/compas_rhino/conversions/extrusions.py +++ b/src/compas_rhino/conversions/extrusions.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import scriptcontext as sc # type: ignore diff --git a/src/compas_rhino/conversions/geometry.py b/src/compas_rhino/conversions/geometry.py index 584790e9bf5f..5bbb1da57385 100644 --- a/src/compas_rhino/conversions/geometry.py +++ b/src/compas_rhino/conversions/geometry.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore from compas.geometry import Frame diff --git a/src/compas_rhino/conversions/meshes.py b/src/compas_rhino/conversions/meshes.py index deff5233ae03..c187275a2e7f 100644 --- a/src/compas_rhino/conversions/meshes.py +++ b/src/compas_rhino/conversions/meshes.py @@ -1,11 +1,4 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -try: - from itertools import zip_longest -except ImportError: - from itertools import izip_longest as zip_longest # type: ignore +from itertools import zip_longest import Rhino # type: ignore import System # type: ignore diff --git a/src/compas_rhino/conversions/shapes.py b/src/compas_rhino/conversions/shapes.py index 320db85a7eec..caba8d2e9d99 100644 --- a/src/compas_rhino/conversions/shapes.py +++ b/src/compas_rhino/conversions/shapes.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import scriptcontext as sc # type: ignore diff --git a/src/compas_rhino/conversions/surfaces.py b/src/compas_rhino/conversions/surfaces.py index ada0588f315a..da331fe3cad2 100644 --- a/src/compas_rhino/conversions/surfaces.py +++ b/src/compas_rhino/conversions/surfaces.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.datastructures import Mesh from compas.geometry import NurbsSurface from compas.geometry import Surface diff --git a/src/compas_rhino/conversions/transformations.py b/src/compas_rhino/conversions/transformations.py index 089fe85c7b90..a11499079246 100644 --- a/src/compas_rhino/conversions/transformations.py +++ b/src/compas_rhino/conversions/transformations.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore diff --git a/src/compas_rhino/devtools.py b/src/compas_rhino/devtools.py index 375fa5d33bb4..0f7edb85bb25 100644 --- a/src/compas_rhino/devtools.py +++ b/src/compas_rhino/devtools.py @@ -1,10 +1,6 @@ import os import sys -__all__ = [ - "DevTools", -] - class DevTools(object): """Tools for working with Python code in development mode, unloading, and reloading code.""" diff --git a/src/compas_rhino/drawing.py b/src/compas_rhino/drawing.py index b4b99a83da0f..00b4974f350d 100644 --- a/src/compas_rhino/drawing.py +++ b/src/compas_rhino/drawing.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from functools import wraps import Rhino # type: ignore diff --git a/src/compas_rhino/geometry/__init__.py b/src/compas_rhino/geometry/__init__.py index 2481a1bfb8f3..8b6e3c262350 100644 --- a/src/compas_rhino/geometry/__init__.py +++ b/src/compas_rhino/geometry/__init__.py @@ -1,8 +1,7 @@ """ This package provides plugins for various geometry pluggables using Rhino as the backend. """ - -from __future__ import absolute_import +# ruff: noqa: F401 from .curves.nurbs import RhinoNurbsCurve from .surfaces.nurbs import RhinoNurbsSurface @@ -23,22 +22,3 @@ from .trimesh_curvature import trimesh_principal_curvature from .trimesh_slicing import trimesh_slice - - -__all__ = [ - "boolean_difference_mesh_mesh", - "boolean_intersection_mesh_mesh", - "boolean_union_mesh_mesh", - "trimesh_gaussian_curvature", - "trimesh_mean_curvature", - "trimesh_principal_curvature", - "trimesh_slice", - "RhinoNurbsCurve", - "RhinoNurbsSurface", - "RhinoBrep", - "RhinoBrepVertex", - "RhinoBrepEdge", - "RhinoBrepFace", - "RhinoBrepLoop", - "RhinoBrepTrim", -] diff --git a/src/compas_rhino/geometry/booleans.py b/src/compas_rhino/geometry/booleans.py index 49c26b7a3cfc..64764e496ff5 100644 --- a/src/compas_rhino/geometry/booleans.py +++ b/src/compas_rhino/geometry/booleans.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore from compas.plugins import plugin diff --git a/src/compas_rhino/geometry/brep/brep.py b/src/compas_rhino/geometry/brep/brep.py index dd3b27718990..86c4c56cd976 100644 --- a/src/compas_rhino/geometry/brep/brep.py +++ b/src/compas_rhino/geometry/brep/brep.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import rhinoscriptsyntax as rs # type: ignore diff --git a/src/compas_rhino/geometry/brep/builder.py b/src/compas_rhino/geometry/brep/builder.py index b7cf503748ef..1717219befa6 100644 --- a/src/compas_rhino/geometry/brep/builder.py +++ b/src/compas_rhino/geometry/brep/builder.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore from compas.geometry import BrepInvalidError diff --git a/src/compas_rhino/geometry/brep/edge.py b/src/compas_rhino/geometry/brep/edge.py index 41fd02817113..1ec31767f9c0 100644 --- a/src/compas_rhino/geometry/brep/edge.py +++ b/src/compas_rhino/geometry/brep/edge.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore from compas.geometry import Arc diff --git a/src/compas_rhino/geometry/brep/face.py b/src/compas_rhino/geometry/brep/face.py index b42e1b8c541b..5cb32fc6de59 100644 --- a/src/compas_rhino/geometry/brep/face.py +++ b/src/compas_rhino/geometry/brep/face.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore from compas.geometry import Brep diff --git a/src/compas_rhino/geometry/brep/loop.py b/src/compas_rhino/geometry/brep/loop.py index 65a9c35c8fce..9802b14e7438 100644 --- a/src/compas_rhino/geometry/brep/loop.py +++ b/src/compas_rhino/geometry/brep/loop.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore from compas.geometry import BrepLoop diff --git a/src/compas_rhino/geometry/brep/trim.py b/src/compas_rhino/geometry/brep/trim.py index b5570bd7e0e0..070b5e796f8f 100644 --- a/src/compas_rhino/geometry/brep/trim.py +++ b/src/compas_rhino/geometry/brep/trim.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore from compas.geometry import BrepTrim diff --git a/src/compas_rhino/geometry/brep/vertex.py b/src/compas_rhino/geometry/brep/vertex.py index 7ae9866efa29..47dcaa1fdd82 100644 --- a/src/compas_rhino/geometry/brep/vertex.py +++ b/src/compas_rhino/geometry/brep/vertex.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from compas.geometry import BrepVertex from compas.geometry import Point from compas_rhino.conversions import point_to_compas diff --git a/src/compas_rhino/geometry/curves/curve.py b/src/compas_rhino/geometry/curves/curve.py index a3df7109fa78..c412017d861b 100644 --- a/src/compas_rhino/geometry/curves/curve.py +++ b/src/compas_rhino/geometry/curves/curve.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino.Geometry # type: ignore from compas.geometry import Curve diff --git a/src/compas_rhino/geometry/curves/nurbs.py b/src/compas_rhino/geometry/curves/nurbs.py index c6e893eb82e9..60a9d8ea2d8d 100644 --- a/src/compas_rhino/geometry/curves/nurbs.py +++ b/src/compas_rhino/geometry/curves/nurbs.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from itertools import groupby import Rhino.Geometry # type: ignore diff --git a/src/compas_rhino/geometry/surfaces/nurbs.py b/src/compas_rhino/geometry/surfaces/nurbs.py index 8fd7210c6354..44ad8319e8a6 100644 --- a/src/compas_rhino/geometry/surfaces/nurbs.py +++ b/src/compas_rhino/geometry/surfaces/nurbs.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from itertools import groupby import Rhino.Geometry # type: ignore diff --git a/src/compas_rhino/geometry/surfaces/surface.py b/src/compas_rhino/geometry/surfaces/surface.py index eb66ca6e8366..e1d4b71d919e 100644 --- a/src/compas_rhino/geometry/surfaces/surface.py +++ b/src/compas_rhino/geometry/surfaces/surface.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino.Geometry # type: ignore from compas.geometry import Surface diff --git a/src/compas_rhino/geometry/trimesh_curvature.py b/src/compas_rhino/geometry/trimesh_curvature.py index e8a9465c94fb..db3db1cc38e7 100644 --- a/src/compas_rhino/geometry/trimesh_curvature.py +++ b/src/compas_rhino/geometry/trimesh_curvature.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from math import atan2 from math import pi from math import sqrt diff --git a/src/compas_rhino/geometry/trimesh_slicing.py b/src/compas_rhino/geometry/trimesh_slicing.py index 79974640451b..e7f4779ca50f 100644 --- a/src/compas_rhino/geometry/trimesh_slicing.py +++ b/src/compas_rhino/geometry/trimesh_slicing.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore from compas.plugins import plugin diff --git a/src/compas_rhino/install.py b/src/compas_rhino/install.py index c66fd865dfdb..3a4391049bc5 100644 --- a/src/compas_rhino/install.py +++ b/src/compas_rhino/install.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import importlib import itertools import os diff --git a/src/compas_rhino/layers.py b/src/compas_rhino/layers.py index a449fcc6af9a..106c36384a2d 100644 --- a/src/compas_rhino/layers.py +++ b/src/compas_rhino/layers.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from collections import deque import rhinoscriptsyntax as rs # type: ignore diff --git a/src/compas_rhino/objects.py b/src/compas_rhino/objects.py index dae80f58712c..426944e11b34 100644 --- a/src/compas_rhino/objects.py +++ b/src/compas_rhino/objects.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import json import warnings diff --git a/src/compas_rhino/scene/__init__.py b/src/compas_rhino/scene/__init__.py index cc243b8022fd..541a416169a4 100644 --- a/src/compas_rhino/scene/__init__.py +++ b/src/compas_rhino/scene/__init__.py @@ -2,8 +2,7 @@ This package provides scene object plugins for visualising COMPAS objects in Rhino. When working in Rhino, :class:`compas.scene.SceneObject` will automatically use the corresponding Rhino scene object for each COMPAS object type. """ - -from __future__ import absolute_import +# ruff: noqa: F401 from compas.plugins import plugin from compas.scene import register @@ -95,30 +94,3 @@ def register_scene_objects(): register(Brep, RhinoBrepObject, context="Rhino") # print("Rhino SceneObjects registered.") - - -__all__ = [ - "RhinoSceneObject", - "RhinoCircleObject", - "RhinoEllipseObject", - "RhinoFrameObject", - "RhinoLineObject", - "RhinoPlaneObject", - "RhinoPointObject", - "RhinoPolygonObject", - "RhinoPolylineObject", - "RhinoVectorObject", - "RhinoBoxObject", - "RhinoCapsuleObject", - "RhinoConeObject", - "RhinoCylinderObject", - "RhinoPolyhedronObject", - "RhinoSphereObject", - "RhinoTorusObject", - "RhinoMeshObject", - "RhinoGraphObject", - "RhinoVolMeshObject", - "RhinoCurveObject", - "RhinoSurfaceObject", - "RhinoBrepObject", -] diff --git a/src/compas_rhino/scene/boxobject.py b/src/compas_rhino/scene/boxobject.py index 6ef643fb3b9e..097ce7114e79 100644 --- a/src/compas_rhino/scene/boxobject.py +++ b/src/compas_rhino/scene/boxobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/brepobject.py b/src/compas_rhino/scene/brepobject.py index 7e9bed8a3e47..b1cc3a4a4930 100644 --- a/src/compas_rhino/scene/brepobject.py +++ b/src/compas_rhino/scene/brepobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/capsuleobject.py b/src/compas_rhino/scene/capsuleobject.py index 9774a034ab20..59f3811b2c77 100644 --- a/src/compas_rhino/scene/capsuleobject.py +++ b/src/compas_rhino/scene/capsuleobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/circleobject.py b/src/compas_rhino/scene/circleobject.py index e2a23f176e10..5a1bec4e99b4 100644 --- a/src/compas_rhino/scene/circleobject.py +++ b/src/compas_rhino/scene/circleobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/coneobject.py b/src/compas_rhino/scene/coneobject.py index 53bbe9c10ec7..8d08300dfa14 100644 --- a/src/compas_rhino/scene/coneobject.py +++ b/src/compas_rhino/scene/coneobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/curveobject.py b/src/compas_rhino/scene/curveobject.py index bffb887367df..c1d7593d33f2 100644 --- a/src/compas_rhino/scene/curveobject.py +++ b/src/compas_rhino/scene/curveobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/cylinderobject.py b/src/compas_rhino/scene/cylinderobject.py index b29060f45ce5..57d2deb2a386 100644 --- a/src/compas_rhino/scene/cylinderobject.py +++ b/src/compas_rhino/scene/cylinderobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/ellipseobject.py b/src/compas_rhino/scene/ellipseobject.py index b0d44c65f011..5d1653b1ab43 100644 --- a/src/compas_rhino/scene/ellipseobject.py +++ b/src/compas_rhino/scene/ellipseobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/frameobject.py b/src/compas_rhino/scene/frameobject.py index ae7d3c4beb4b..3df859cbc748 100644 --- a/src/compas_rhino/scene/frameobject.py +++ b/src/compas_rhino/scene/frameobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.colors import Color diff --git a/src/compas_rhino/scene/graphobject.py b/src/compas_rhino/scene/graphobject.py index a761a559e36e..d9d467839175 100644 --- a/src/compas_rhino/scene/graphobject.py +++ b/src/compas_rhino/scene/graphobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import scriptcontext as sc # type: ignore diff --git a/src/compas_rhino/scene/helpers.py b/src/compas_rhino/scene/helpers.py index 6463acc3edfd..c42d9da13161 100644 --- a/src/compas_rhino/scene/helpers.py +++ b/src/compas_rhino/scene/helpers.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import rhinoscriptsyntax as rs # type: ignore import scriptcontext as sc # type: ignore diff --git a/src/compas_rhino/scene/lineobject.py b/src/compas_rhino/scene/lineobject.py index 9ab5c22e8408..1c0528818b37 100644 --- a/src/compas_rhino/scene/lineobject.py +++ b/src/compas_rhino/scene/lineobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/meshobject.py b/src/compas_rhino/scene/meshobject.py index 7958a16fae6a..0eed5f5feb1f 100644 --- a/src/compas_rhino/scene/meshobject.py +++ b/src/compas_rhino/scene/meshobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import scriptcontext as sc # type: ignore diff --git a/src/compas_rhino/scene/planeobject.py b/src/compas_rhino/scene/planeobject.py index eece052c32c6..ea03d31ae7e1 100644 --- a/src/compas_rhino/scene/planeobject.py +++ b/src/compas_rhino/scene/planeobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.geometry import Frame diff --git a/src/compas_rhino/scene/pointobject.py b/src/compas_rhino/scene/pointobject.py index 4091fb7534b2..9bdcd7b96fe6 100644 --- a/src/compas_rhino/scene/pointobject.py +++ b/src/compas_rhino/scene/pointobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/polygonobject.py b/src/compas_rhino/scene/polygonobject.py index 3cde33d58742..28ec4bbbda19 100644 --- a/src/compas_rhino/scene/polygonobject.py +++ b/src/compas_rhino/scene/polygonobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/polyhedronobject.py b/src/compas_rhino/scene/polyhedronobject.py index 8800026b5191..b92bc6f7bf98 100644 --- a/src/compas_rhino/scene/polyhedronobject.py +++ b/src/compas_rhino/scene/polyhedronobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/polylineobject.py b/src/compas_rhino/scene/polylineobject.py index b00f7226708a..94a739a47a3a 100644 --- a/src/compas_rhino/scene/polylineobject.py +++ b/src/compas_rhino/scene/polylineobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/sceneobject.py b/src/compas_rhino/scene/sceneobject.py index ac1f098b655a..7c76104a974a 100644 --- a/src/compas_rhino/scene/sceneobject.py +++ b/src/compas_rhino/scene/sceneobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import Rhino # type: ignore import scriptcontext as sc # type: ignore import System # type: ignore diff --git a/src/compas_rhino/scene/sphereobject.py b/src/compas_rhino/scene/sphereobject.py index ad6278cff993..6ee6ac38c6be 100644 --- a/src/compas_rhino/scene/sphereobject.py +++ b/src/compas_rhino/scene/sphereobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/surfaceobject.py b/src/compas_rhino/scene/surfaceobject.py index e352b237584f..1079576dd022 100644 --- a/src/compas_rhino/scene/surfaceobject.py +++ b/src/compas_rhino/scene/surfaceobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/torusobject.py b/src/compas_rhino/scene/torusobject.py index 477d24403dc0..864ca598e37f 100644 --- a/src/compas_rhino/scene/torusobject.py +++ b/src/compas_rhino/scene/torusobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.scene import GeometryObject diff --git a/src/compas_rhino/scene/vectorobject.py b/src/compas_rhino/scene/vectorobject.py index d95eb321a66f..f9f30fa39d4a 100644 --- a/src/compas_rhino/scene/vectorobject.py +++ b/src/compas_rhino/scene/vectorobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from compas.geometry import Point diff --git a/src/compas_rhino/scene/volmeshobject.py b/src/compas_rhino/scene/volmeshobject.py index 9a512a1c82fa..31f79491df4b 100644 --- a/src/compas_rhino/scene/volmeshobject.py +++ b/src/compas_rhino/scene/volmeshobject.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import scriptcontext as sc # type: ignore from Rhino.Geometry import TextDot # type: ignore diff --git a/src/compas_rhino/ui.py b/src/compas_rhino/ui.py index bdbd98eaebc0..a43bd9a63db1 100644 --- a/src/compas_rhino/ui.py +++ b/src/compas_rhino/ui.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import os import rhinoscriptsyntax as rs # type: ignore diff --git a/src/compas_rhino/uninstall.py b/src/compas_rhino/uninstall.py index cb4e4a656efe..f812ea1c0956 100644 --- a/src/compas_rhino/uninstall.py +++ b/src/compas_rhino/uninstall.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import itertools import os import sys diff --git a/src/compas_rhino/uninstall_plugin.py b/src/compas_rhino/uninstall_plugin.py index 21c61566ac1b..7c2e903cc80e 100644 --- a/src/compas_rhino/uninstall_plugin.py +++ b/src/compas_rhino/uninstall_plugin.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import os import compas_rhino diff --git a/src/compas_rhino/utilities/__init__.py b/src/compas_rhino/utilities/__init__.py deleted file mode 100644 index 51790bb787eb..000000000000 --- a/src/compas_rhino/utilities/__init__.py +++ /dev/null @@ -1,40 +0,0 @@ -from __future__ import absolute_import -from warnings import warn - -from ..drawing import ( - draw_labels, - draw_points, - draw_lines, - draw_geodesics, - draw_polylines, - draw_breps, - draw_faces, - draw_cylinders, - draw_pipes, - draw_spheres, - draw_mesh, - draw_circles, - draw_curves, - draw_surfaces, - draw_brep, -) - -__all__ = [ - "draw_labels", - "draw_points", - "draw_lines", - "draw_geodesics", - "draw_polylines", - "draw_breps", - "draw_faces", - "draw_cylinders", - "draw_pipes", - "draw_spheres", - "draw_mesh", - "draw_circles", - "draw_curves", - "draw_surfaces", - "draw_brep", -] - -warn("compas_rhino.utilities will be removed in version 2.3. Please use compas_rhino.drawing instead.", DeprecationWarning, stacklevel=2)