version 2.0.1

Author: redruin1

.coveragerc

@@ -1,7 +1,7 @@
 # python coverage configuration file
 [run]
 omit = 
-    test/test_*.py 
+    test/**
     draftsman/env.py 
     draftsman/environment/*
 branch = True

changelog.md

@@ -1,14 +1,16 @@
 # Changelog
 
 ## 2.0.1
-* Updated `factorio-data` to version `2.0.33` (latest)
+* Updated `factorio-data` to version `2.0.41` (latest)
 * Added `planets.get_surface_properties()` which grabs a dict of surface properties with valid defaults
 * Added `Entity.surface_conditions`, which maps directly to the Factorio API `surface_conditions`
 * Added `Entity.is_placeable_on()`, which returns false if an entity's `surface_conditions` prohibit their construction on a planet
 * Added `utils.passes_surface_conditions()`, which acts as the abstract backend which runs `Entity.is_placable_on()` and `recipes.is_usable_on()`
+* Added testing for `Asteroid Collector`
 * Finished implementing features for `LogisticsContainer`s
 * `quality` is now an accessible and modifiable attribute of `Entity`s
 * Made `Container.inventory_size` proportional to the entity's `quality`
+    * *(note that all quality modifiers are not yet available)*
 * Merge RosieBaish's pull request:
     * Add logic to allow mods with different special characters
 * Merge Gavinp's pull requests:
@@ -17,6 +19,7 @@
     * `draftsman` now prints usage/help on empty args.
 * Fixed #142 (Logistics containers not importing properly)
 * Fixed #121 (Support for Bob's Inserters)
+* Fixed #151 (Severe Performance degradation when using `add_circuit_connection`)
 
 ## 2.0.0
 * Updated `factorio-data` to version `2.0.28` (latest)

draftsman/_factorio_version.py

@@ -1,4 +1,4 @@
 # _factorio_version.py
 
-__factorio_version__ = "2.0.34.0"
-__factorio_version_info__ = (2, 0, 34, 0)
+__factorio_version__ = "2.0.42.0"
+__factorio_version_info__ = (2, 0, 42, 0)

draftsman/classes/collection.py

@@ -795,19 +795,25 @@ def add_circuit_connection(
         # if not isinstance(location_2, tuple):
         #     location_2 = (location_2, "input")
 
-        if not isinstance(entity_1, EntityLike):
+        if isinstance(entity_1, EntityLike):
+            if entity_1 not in self.entities:
+                raise InvalidAssociationError(
+                    "entity_1 ({}) not contained within this collection".format(
+                        entity_1
+                    )
+                )
+        else:
             entity_1 = self.entities[entity_1]
-        if not isinstance(entity_2, EntityLike):
-            entity_2 = self.entities[entity_2]
 
-        if entity_1 not in self.entities:
-            raise InvalidAssociationError(
-                "entity_1 ({}) not contained within this collection".format(entity_1)
-            )
-        if entity_2 not in self.entities:
-            raise InvalidAssociationError(
-                "entity_2 ({}) not contained within this collection".format(entity_2)
-            )
+        if isinstance(entity_2, EntityLike):
+            if entity_2 not in self.entities:
+                raise InvalidAssociationError(
+                    "entity_2 ({}) not contained within this collection".format(
+                        entity_2
+                    )
+                )
+        else:
+            entity_2 = self.entities[entity_2]
 
         if color not in {"red", "green"}:
             raise InvalidWireTypeError(color)

draftsman/classes/mixins/request_filters.py

@@ -162,11 +162,7 @@ def request_filters(self, value: Optional[Format.RequestFilters]) -> None:
         # else:
         #     self._root.request_filters = value
         result = attempt_and_reissue(
-            self,
-            type(self).Format,
-            self._root,
-            "request_filters",
-            value
+            self, type(self).Format, self._root, "request_filters", value
         )
         self._root.request_filters = result