Skip to content

Commit

Permalink
ruff, isort
Browse files Browse the repository at this point in the history
  • Loading branch information
tomvanmele committed Apr 23, 2024
1 parent e46dcfe commit eb4e90e
Show file tree
Hide file tree
Showing 285 changed files with 972 additions and 1,221 deletions.
2 changes: 1 addition & 1 deletion src/compas/_iotools.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""For the time being, these functions are only for internal use."""

from contextlib import contextmanager
import io
from contextlib import contextmanager

try:
from urllib.request import urlopen
Expand Down
3 changes: 2 additions & 1 deletion src/compas/_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,8 @@ def _get_win_folder_from_registry(csidl_name):


def _get_win_folder_with_pywin32(csidl_name):
from win32com.shell import shellcon, shell
from win32com.shell import shell
from win32com.shell import shellcon

dir = shell.SHGetFolderPath(0, getattr(shellcon, csidl_name), 0, 0)
# Try to make this a unicode path because SHGetFolderPath does
Expand Down
3 changes: 2 additions & 1 deletion src/compas/colors/colordict.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from compas.data import Data

from .color import Color


Expand Down
2 changes: 1 addition & 1 deletion src/compas/colors/colormap.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from compas.itertools import linspace

from .color import Color
from .mpl_colormap import _magma_data
from .mpl_colormap import _inferno_data
from .mpl_colormap import _magma_data
from .mpl_colormap import _plasma_data
from .mpl_colormap import _viridis_data

Expand Down
2 changes: 1 addition & 1 deletion src/compas/data/coercion.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from .validators import is_item_iterable

Expand Down
7 changes: 3 additions & 4 deletions src/compas/data/data.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

try:
from typing import TypeVar # noqa: F401
Expand All @@ -10,13 +10,12 @@
pass

import hashlib
from uuid import uuid4
from uuid import UUID
from copy import deepcopy
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
Expand Down
2 changes: 1 addition & 1 deletion src/compas/data/encoders.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

try:
from typing import Type # noqa: F401
Expand Down
5 changes: 3 additions & 2 deletions src/compas/data/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from __future__ import division
from __future__ import print_function

import os
import json
import os


def dataclass_dataschema(cls): # type: (...) -> dict
Expand Down Expand Up @@ -119,10 +119,11 @@ def compas_dataclasses(): # type: (...) -> list
"""
from collections import deque
from compas.data import Data

import compas.colors # noqa: F401
import compas.datastructures # noqa: F401
import compas.geometry # noqa: F401
from compas.data import Data

tovisit = deque([Data])
dataclasses = []
Expand Down
2 changes: 1 addition & 1 deletion src/compas/data/validators.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

try:
basestring # type: ignore
Expand Down
3 changes: 2 additions & 1 deletion src/compas/datastructures/assembly/assembly.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from compas.datastructures import Datastructure
from compas.datastructures import Graph

from .exceptions import AssemblyError


Expand Down
8 changes: 4 additions & 4 deletions src/compas/datastructures/assembly/part.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from __future__ import print_function
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
from compas.geometry import Frame
from compas.geometry import Polyhedron
from compas.geometry import Brep
from compas.datastructures import Datastructure
from compas.data import Data


class Feature(Data):
Expand Down
30 changes: 9 additions & 21 deletions src/compas/datastructures/cell_network/cell_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,34 @@

from random import sample

from compas.datastructures import Mesh
from compas.datastructures import Graph
from compas.datastructures.datastructure import Datastructure
from compas.datastructures.attributes import VertexAttributeView
from compas.datastructures import Mesh
from compas.datastructures.attributes import CellAttributeView
from compas.datastructures.attributes import EdgeAttributeView
from compas.datastructures.attributes import FaceAttributeView
from compas.datastructures.attributes import CellAttributeView

from compas.datastructures.attributes import VertexAttributeView
from compas.datastructures.datastructure import Datastructure
from compas.files import OBJ

from compas.geometry import Line
from compas.geometry import Point
from compas.geometry import Polygon
from compas.geometry import Polyhedron
from compas.geometry import Vector
from compas.geometry import add_vectors
from compas.geometry import bestfit_plane
from compas.geometry import bounding_box
from compas.geometry import centroid_points
from compas.geometry import centroid_polygon
from compas.geometry import centroid_polyhedron
from compas.geometry import distance_point_point
from compas.geometry import length_vector
from compas.geometry import normal_polygon
from compas.geometry import normalize_vector
from compas.geometry import volume_polyhedron
from compas.geometry import add_vectors
from compas.geometry import bestfit_plane
from compas.geometry import project_point_plane
from compas.geometry import scale_vector
from compas.geometry import subtract_vectors
from compas.geometry import bounding_box

from compas.geometry import volume_polyhedron
from compas.itertools import pairwise

from compas.tolerance import TOL


Expand Down Expand Up @@ -227,15 +223,7 @@ def __from_data__(cls, data):

return cell_network

def __init__(
self,
default_vertex_attributes=None,
default_edge_attributes=None,
default_face_attributes=None,
default_cell_attributes=None,
name=None,
**kwargs
):
def __init__(self, default_vertex_attributes=None, default_edge_attributes=None, default_face_attributes=None, default_cell_attributes=None, name=None, **kwargs):
super(CellNetwork, self).__init__(kwargs, name=name)
self._max_vertex = -1
self._max_face = -1
Expand Down
5 changes: 2 additions & 3 deletions src/compas/datastructures/graph/duality.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from math import pi

from compas.itertools import pairwise
from compas.geometry import angle_vectors
from compas.geometry import is_ccw_xy

from compas.itertools import pairwise

PI2 = 2.0 * pi

Expand Down
36 changes: 17 additions & 19 deletions src/compas/datastructures/graph/graph.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from random import sample
from ast import literal_eval
from itertools import combinations
from random import sample

import compas

Expand All @@ -13,42 +13,40 @@
else:
from collections.abc import Mapping

from compas.tolerance import TOL
from compas.datastructures.attributes import EdgeAttributeView
from compas.datastructures.attributes import NodeAttributeView
from compas.datastructures.datastructure import Datastructure
from compas.files import OBJ
from compas.geometry import Box
from compas.geometry import Line
from compas.geometry import Point
from compas.geometry import Vector
from compas.geometry import Line
from compas.geometry import Box
from compas.geometry import add_vectors
from compas.geometry import bounding_box
from compas.geometry import centroid_points
from compas.geometry import subtract_vectors
from compas.geometry import distance_point_point
from compas.geometry import midpoint_line
from compas.geometry import normalize_vector
from compas.geometry import add_vectors
from compas.geometry import oriented_bounding_box
from compas.geometry import scale_vector
from compas.geometry import subtract_vectors
from compas.geometry import transform_points
from compas.geometry import bounding_box
from compas.geometry import oriented_bounding_box
from compas.tolerance import TOL
from compas.topology import astar_shortest_path
from compas.topology import breadth_first_traverse
from compas.topology import connected_components

from compas.datastructures.datastructure import Datastructure
from compas.datastructures.attributes import NodeAttributeView
from compas.datastructures.attributes import EdgeAttributeView

from .operations.split import graph_split_edge
from .duality import graph_find_cycles
from .operations.join import graph_join_edges

from .operations.split import graph_split_edge
from .planarity import graph_count_crossings
from .planarity import graph_embed_in_plane
from .planarity import graph_find_crossings
from .planarity import graph_is_crossed
from .planarity import graph_is_planar
from .planarity import graph_is_planar_embedding
from .planarity import graph_is_xy
from .planarity import graph_count_crossings
from .planarity import graph_find_crossings
from .planarity import graph_embed_in_plane
from .smoothing import graph_smooth_centroid
from .duality import graph_find_cycles


class Graph(Datastructure):
Expand Down
14 changes: 4 additions & 10 deletions src/compas/datastructures/graph/operations/join.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from compas.tolerance import TOL
from compas.itertools import pairwise
from compas.tolerance import TOL


def graph_join_edges(graph, key):
Expand Down Expand Up @@ -104,15 +104,9 @@ def graph_polylines(graph, splits=None):
# get adjacent edges until the polyline is closed...
while polyline[0] != polyline[-1]:
# ... or until both end are non-two-valent vertices
if (
len(graph.neighbors(polyline[-1])) != 2
or TOL.geometric_key(graph.node_coordinates(polyline[-1])) in stop_geom_keys
):
if len(graph.neighbors(polyline[-1])) != 2 or TOL.geometric_key(graph.node_coordinates(polyline[-1])) in stop_geom_keys:
polyline = list(reversed(polyline))
if (
len(graph.neighbors(polyline[-1])) != 2
or TOL.geometric_key(graph.node_coordinates(polyline[-1])) in stop_geom_keys
):
if len(graph.neighbors(polyline[-1])) != 2 or TOL.geometric_key(graph.node_coordinates(polyline[-1])) in stop_geom_keys:
break

# add next edge
Expand Down
2 changes: 1 addition & 1 deletion src/compas/datastructures/graph/operations/split.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function


def graph_split_edge(graph, edge, t=0.5):
Expand Down
8 changes: 3 additions & 5 deletions src/compas/datastructures/graph/planarity.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
from __future__ import print_function
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 sin
from math import pi

from itertools import product
from math import sin

from compas.geometry import angle_vectors_xy
from compas.geometry import is_ccw_xy
from compas.geometry import subtract_vectors_xy

from compas.geometry._core.predicates_2 import is_intersection_segment_segment_xy


Expand Down
2 changes: 1 addition & 1 deletion src/compas/datastructures/graph/smoothing.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from compas.geometry import centroid_points

Expand Down
12 changes: 3 additions & 9 deletions src/compas/datastructures/mesh/conway.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function


def mesh_conway_dual(mesh):
Expand Down Expand Up @@ -185,11 +185,7 @@ def mesh_conway_kis(mesh):
v = mesh.number_of_vertices()
vkey_index = {vkey: i for i, vkey in enumerate(mesh.vertices())}
fkey_index = {fkey: i + v for i, fkey in enumerate(mesh.faces())}
faces = [
[vkey_index[u], vkey_index[v], fkey_index[mesh.halfedge[u][v]]]
for fkey in mesh.faces()
for u, v in mesh.face_halfedges(fkey)
]
faces = [[vkey_index[u], vkey_index[v], fkey_index[mesh.halfedge[u][v]]] for fkey in mesh.faces() for u, v in mesh.face_halfedges(fkey)]
return cls.from_vertices_and_faces(vertices, faces)


Expand Down Expand Up @@ -427,9 +423,7 @@ def mesh_conway_gyro(mesh):
F = mesh.number_of_faces()
vkey_index = {vkey: i for i, vkey in enumerate(mesh.vertices())}
fkey_index = {fkey: i + V for i, fkey in enumerate(mesh.faces())}
ekey_index = {
halfedge: i + V + F for i, halfedge in enumerate([(u, v) for u in mesh.vertices() for v in mesh.halfedge[u]])
}
ekey_index = {halfedge: i + V + F for i, halfedge in enumerate([(u, v) for u in mesh.vertices() for v in mesh.halfedge[u]])}
faces = []
for fkey in mesh.faces():
for u, v in mesh.face_halfedges(fkey):
Expand Down
Loading

0 comments on commit eb4e90e

Please sign in to comment.