From 6e335a7fc36755d7bab5ab0003e42dedfc9d014b Mon Sep 17 00:00:00 2001
From: Darren Eberly <darren.eberly@gmail.com>
Date: Thu, 11 Aug 2022 02:11:31 -0400
Subject: [PATCH] More CI test fixes

---
 .github/workflows/lint.yml                    | 38 -------------------
 .github/workflows/test.yml                    | 19 ++++++++--
 tests/test_data/world_tests/both/expected.py  |  4 +-
 .../world_tests/pattern_matched/expected.py   |  6 +--
 tests/test_world.py                           | 13 +------
 5 files changed, 21 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 27e805a..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches: [development]
-  pull_request:
-    branches: [development]
-  workflow_dispatch:
-
-jobs:
-
-  build:
-    name: Lint
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@master
-      - name: Set up Python 3.x
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-          architecture: 'x64'
-      - name: dependencies
-        run: |
-          python -m pip install -U pip wheel setuptools
-      - name: wheel
-        run: |
-          python -m pip install -e .[tests]
-      - name: flake8
-        run: |
-          flake8 pytiled_parser
-      - name: mypy
-        run: |
-          mypy pytiled_parser
-      - name: black
-        run: |
-          black pytiled_parser --check
-      
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 35af94c..f42ec86 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,14 +25,25 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: ${{ matrix.architecture }}
+          architecture: ${{ matrix-python-version }}
       - name: dependencies
         run: |
           python -m pip install -U pip wheel setuptools
       - name: wheel
         run: |
           python -m pip install -e .[tests]
-      - name: pytest
+      - name: flake8
         run: |
-          pytest --cov=pytiled_parser --cov-report=xml --cov-report=html
-      
\ No newline at end of file
+          flake8 pytiled_parser
+      - name: mypy
+        if: success() || failure()
+        run: |
+          mypy pytiled_parser
+      - name: black
+        if: success() || failure()
+        run: |
+          black pytiled_parser --check
+      - name: pytest
+        if: success() || failure()
+        run: |
+          pytest --cov=pytiled_parser --cov-report=xml --cov-report=html
\ No newline at end of file
diff --git a/tests/test_data/world_tests/both/expected.py b/tests/test_data/world_tests/both/expected.py
index 57d2dc1..f2762d8 100644
--- a/tests/test_data/world_tests/both/expected.py
+++ b/tests/test_data/world_tests/both/expected.py
@@ -14,14 +14,14 @@ EXPECTED = world.World(
         ),
         world.WorldMap(
             size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(0, 0),
+            coordinates=common_types.OrderedPair(0.0, 0.0),
             map_file=Path(Path(__file__).parent / "map_p0-n0.json")
             .absolute()
             .resolve(),
         ),
         world.WorldMap(
             size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(0, 160),
+            coordinates=common_types.OrderedPair(0.0, 160.0),
             map_file=Path(Path(__file__).parent / "map_p0-n1.json")
             .absolute()
             .resolve(),
diff --git a/tests/test_data/world_tests/pattern_matched/expected.py b/tests/test_data/world_tests/pattern_matched/expected.py
index 6703c79..c5c078e 100644
--- a/tests/test_data/world_tests/pattern_matched/expected.py
+++ b/tests/test_data/world_tests/pattern_matched/expected.py
@@ -1,20 +1,20 @@
 from pathlib import Path
 
-from pytiled_parser import common_types, layer, tiled_map, tileset, world
+from pytiled_parser import common_types, world
 
 EXPECTED = world.World(
     only_show_adjacent=False,
     maps=[
         world.WorldMap(
             size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(0, 0),
+            coordinates=common_types.OrderedPair(0.0, 0.0),
             map_file=Path(Path(__file__).parent / "map_p0-n0.json")
             .absolute()
             .resolve(),
         ),
         world.WorldMap(
             size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(0, 160),
+            coordinates=common_types.OrderedPair(0.0, 160.0),
             map_file=Path(Path(__file__).parent / "map_p0-n1.json")
             .absolute()
             .resolve(),
diff --git a/tests/test_world.py b/tests/test_world.py
index e3eaed6..09024e5 100644
--- a/tests/test_world.py
+++ b/tests/test_world.py
@@ -5,7 +5,7 @@ from pathlib import Path
 
 import pytest
 
-from pytiled_parser import OrderedPair, world
+from pytiled_parser import world
 
 TESTS_DIR = Path(os.path.dirname(os.path.abspath(__file__)))
 TEST_DATA = TESTS_DIR / "test_data"
@@ -18,16 +18,6 @@ ALL_WORLD_TESTS = [
 ]
 
 
-def fix_world_map(world_map):
-    world_map.coordinates = OrderedPair(
-        round(world_map.coordinates[0], 3), round(world_map.coordinates[1], 3)
-    )
-
-
-def fix_world(world):
-    for world_map in world.maps:
-        fix_world_map(world_map)
-
 @pytest.mark.parametrize("world_test", ALL_WORLD_TESTS)
 def test_world_integration(world_test):
     # it's a PITA to import like this, don't do it
@@ -41,6 +31,5 @@ def test_world_integration(world_test):
     raw_world_path = world_test / "world.world"
 
     casted_world = world.parse_world(raw_world_path)
-    fix_world(casted_world)
 
     assert casted_world == expected.EXPECTED