From f0ed78d1b28eb789d971619696e1373f4b02ca2b Mon Sep 17 00:00:00 2001 From: Dominik Kozaczko Date: Mon, 13 Jul 2020 23:22:51 +0200 Subject: [PATCH] Drop Python <3.5 --- .travis.yml | 3 +- dev-requirements.txt | 1 + examples/brothers.py | 2 - examples/buggy.py | 2 - examples/diver.py | 1 - examples/figure.py | 1 - examples/figures.py | 1 - examples/mandelbrot.py | 1 - examples/moon_landing.py | 2 - examples/spaceman.py | 1 - examples/stairs.py | 1 - ldraw/__init__.py | 17 +-- ldraw/compat.py | 22 +-- ldraw/generation/colours.py | 1 - ldraw/generation/parts.py | 1 - ldraw/geometry.py | 2 +- ldraw/pieces.py | 6 +- setup.py | 2 +- tests/test_data/examples/spaceman.ldr | 162 +++++++++++----------- tests/test_data/examples/spaceman.py3.ldr | 81 ----------- tests/test_examples.py | 14 +- tox.ini | 2 +- 22 files changed, 105 insertions(+), 221 deletions(-) delete mode 100644 tests/test_data/examples/spaceman.py3.ldr diff --git a/.travis.yml b/.travis.yml index acdf1d1c..59a5bce6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ apt: packages: - dos2unix python: -- 2.7 - 3.5 - 3.6 - 3.7 @@ -31,4 +30,4 @@ deploy: on: tags: true distributions: sdist bdist_wheel - condition: $TRAVIS_PYTHON_VERSION = "2.7" + condition: $TRAVIS_PYTHON_VERSION = "3.7" diff --git a/dev-requirements.txt b/dev-requirements.txt index b62a7705..e09089a9 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,3 +5,4 @@ pytest-cov mock setuptools_scm tox +ipdb diff --git a/examples/brothers.py b/examples/brothers.py index 61153a65..ef174b6b 100755 --- a/examples/brothers.py +++ b/examples/brothers.py @@ -20,8 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function - from ldraw.figure import * from ldraw.library.colours import * from ldraw.library.parts.minifig.accessories import GunRevolver, CapWithLongFlatPeak diff --git a/examples/buggy.py b/examples/buggy.py index ac79bf3c..f1d3e644 100644 --- a/examples/buggy.py +++ b/examples/buggy.py @@ -20,8 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function - from ldraw.figure import * from ldraw.geometry import YAxis from ldraw.library.colours import * diff --git a/examples/diver.py b/examples/diver.py index f6e55fcb..c432cfe6 100755 --- a/examples/diver.py +++ b/examples/diver.py @@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function from ldraw.library.colours import * from ldraw.figure import * from ldraw.library.parts.minifig.accessories import DiverMask, HairMale, Airtanks, Flipper, CameraMovie diff --git a/examples/figure.py b/examples/figure.py index 3468eebf..076b43a6 100644 --- a/examples/figure.py +++ b/examples/figure.py @@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function from ldraw.library.colours import * from ldraw.figure import * from ldraw.library.parts.minifig.accessories import HairMale diff --git a/examples/figures.py b/examples/figures.py index 107053d2..ee9e27ec 100755 --- a/examples/figures.py +++ b/examples/figures.py @@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function from ldraw.library.colours import * from ldraw.figure import * from ldraw.library.parts.minifig.accessories import HelmetClassicWithThickChinGuardAndVisorDimples as HelmetClassic, Torch, MetalDetector diff --git a/examples/mandelbrot.py b/examples/mandelbrot.py index 07a76f09..42389080 100755 --- a/examples/mandelbrot.py +++ b/examples/mandelbrot.py @@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function from ldraw.library.colours import (Blue_Violet, Blue, Light_Blue, Light_Green, Green, Yellow, Orange, Red, Magenta, Purple, diff --git a/examples/moon_landing.py b/examples/moon_landing.py index af79a8b2..66543066 100755 --- a/examples/moon_landing.py +++ b/examples/moon_landing.py @@ -20,8 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function - from ldraw.figure import * from ldraw.library.colours import * from ldraw.library.parts.antenna import Antenna4HWithRoundedTop diff --git a/examples/spaceman.py b/examples/spaceman.py index eb72db8a..7718b887 100644 --- a/examples/spaceman.py +++ b/examples/spaceman.py @@ -1,4 +1,3 @@ -from __future__ import print_function import random from ldraw.geometry import Identity, XAxis, YAxis, ZAxis, Vector diff --git a/examples/stairs.py b/examples/stairs.py index d1c279ba..eda1535b 100644 --- a/examples/stairs.py +++ b/examples/stairs.py @@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function from ldraw.figure import * from ldraw.geometry import Identity from ldraw.library.colours import * diff --git a/ldraw/__init__.py b/ldraw/__init__.py index 5bd58d29..8c27774d 100644 --- a/ldraw/__init__.py +++ b/ldraw/__init__.py @@ -18,25 +18,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from __future__ import print_function - import hashlib -import shutil -import sys import imp - import os +import shutil +import sys import zipfile from distutils.dir_util import copy_tree +from urllib.request import urlretrieve from mklist.generate import generate_parts_lst +from pkg_resources import get_distribution, DistributionNotFound from ldraw.config import get_config, write_config -from ldraw.compat import urlretrieve, PY2 from ldraw.dirs import get_data_dir, get_config_dir, get_cache_dir - -from pkg_resources import get_distribution, DistributionNotFound - from ldraw.generation.colours import gen_colours from ldraw.generation.parts import gen_parts from ldraw.parts import Parts @@ -94,7 +89,7 @@ def try_download_generate_lib(): return data_dir -class CustomImporter(object): +class CustomImporter: """ Added to sys.meta_path as an import hook """ virtual_module = 'ldraw.library' @@ -105,7 +100,7 @@ def valid_module(cls, fullname): if not rest or rest.startswith('.'): return True - def find_module(self, fullname, path=None): # pylint:disable=unused-argument + def find_module(self, fullname, path=None): # pylint:disable=unused-argument """ This method is called by Python if this class is on sys.path. fullname is the fully-qualified diff --git a/ldraw/compat.py b/ldraw/compat.py index ef340b1d..7d0d076d 100644 --- a/ldraw/compat.py +++ b/ldraw/compat.py @@ -1,21 +1,7 @@ """ compatibility module for python 2/3 """ -import sys -PY2 = sys.version_info[0] == 2 - -if PY2: - from urllib import urlretrieve - from StringIO import StringIO - from __builtin__ import reduce - - do_execfile = execfile -else: - from io import StringIO - from urllib.request import urlretrieve - from functools import reduce - - def do_execfile(script, global_vars, local_vars): - with open(script) as f: - code = compile(f.read(), script, 'exec') - exec(code, global_vars, local_vars) +def do_execfile(script, global_vars, local_vars): + with open(script) as f: + code = compile(f.read(), script, 'exec') + exec (code, global_vars, local_vars) diff --git a/ldraw/generation/colours.py b/ldraw/generation/colours.py index e6b95696..8076179f 100644 --- a/ldraw/generation/colours.py +++ b/ldraw/generation/colours.py @@ -2,7 +2,6 @@ """ Called by ldraw.library_gen to generate the ldraw/library/colours.py file """ -from __future__ import print_function import codecs import os diff --git a/ldraw/generation/parts.py b/ldraw/generation/parts.py index 00ebe7d7..20dc40dd 100755 --- a/ldraw/generation/parts.py +++ b/ldraw/generation/parts.py @@ -2,7 +2,6 @@ """ Generates the ldraw.library.parts namespace """ -from __future__ import print_function import codecs import os import itertools diff --git a/ldraw/geometry.py b/ldraw/geometry.py index b798faa1..8a774748 100644 --- a/ldraw/geometry.py +++ b/ldraw/geometry.py @@ -22,7 +22,7 @@ import copy import math from numbers import Number -from ldraw.compat import reduce +from functools import reduce class MatrixError(Exception): diff --git a/ldraw/pieces.py b/ldraw/pieces.py index 874942c5..5b4156d4 100644 --- a/ldraw/pieces.py +++ b/ldraw/pieces.py @@ -19,11 +19,11 @@ along with this program. If not, see . """ # pylint: disable=too-many-arguments, too-few-public-methods -from ldraw.compat import reduce +from functools import reduce from ldraw.geometry import Identity, Vector -class Piece(object): +class Piece: """ a Piece, which is a Part with a certain colour at a certain position and rotation @@ -51,7 +51,7 @@ def __repr__(self): ("%s.DAT" % self.part) -class Group(object): +class Group: """ a Group of Pieces """ def __init__(self, position=Vector(0, 0, 0), matrix=Identity()): self.position = position diff --git a/setup.py b/setup.py index 79e0c2f0..b82b1445 100755 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ def get_readme(): maintainer="Matthieu Berthomé ", author_email="rienairefr@gmail.com, david@boddie.org.uk", version=os.environ.get("TAG_NAME", os.environ.get("TRAVIS_TAG", "dev")), - python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <3.9", + python_requires=">=3.5, <3.9", packages=find_packages(), package_data={"ldraw": ["templates/*.mustache"]}, use_scm_version=True, diff --git a/tests/test_data/examples/spaceman.ldr b/tests/test_data/examples/spaceman.ldr index 8ad8bf6a..7278ae3d 100644 --- a/tests/test_data/examples/spaceman.ldr +++ b/tests/test_data/examples/spaceman.ldr @@ -1,81 +1,81 @@ -1 14 -121.354850 9.915910 -104.652430 0.453368 0.889785 -0.052336 0.751504 -0.413163 -0.514332 -0.479269 0.193851 -0.855993 3626BPS5.DAT -1 17 -100.000000 0.000000 -100.000000 0.453368 0.889785 -0.052336 0.751504 -0.413163 -0.514332 -0.479269 0.193851 -0.855993 973P90.DAT -1 1 -71.526866 -13.221213 -93.796760 0.453368 0.889785 -0.052336 0.751504 -0.413163 -0.514332 -0.479269 0.193851 -0.855993 3815B.DAT -1 4 -60.849441 -18.179168 -91.470545 0.453368 0.655744 0.603702 0.751504 0.082973 -0.654490 -0.479269 0.750410 -0.455177 3817B.DAT -1 2 -60.849441 -18.179168 -91.470545 0.453368 0.758888 0.467489 0.751504 -0.043434 -0.658297 -0.479269 0.649771 -0.590000 3816B.DAT -1 4 -86.081192 7.967262 -105.638219 0.291971 0.118825 0.949017 0.811832 0.493799 -0.311593 -0.505649 0.861419 0.047709 3819.DAT -1 14 -91.434428 22.413522 -93.446073 0.420372 0.632451 0.650610 0.830878 0.019809 -0.556103 -0.364596 0.774347 -0.517162 3820.DAT -1 2 -99.682241 -14.577868 -91.260161 0.600990 0.038409 0.798333 0.668342 0.523633 -0.528325 -0.438326 0.851078 0.289028 3818.DAT -1 14 -108.618246 -3.594558 -77.639783 -0.277938 0.760483 0.586870 0.193321 0.642724 -0.741305 -0.940945 -0.092583 -0.325654 3820.DAT -1 14 -119.647714 13.566482 2.432671 -0.435286 0.818655 0.374607 -0.725898 -0.565270 0.391845 0.532540 -0.101361 0.840314 3626BPS5.DAT -1 17 -100.000000 0.000000 0.000000 -0.435286 0.818655 0.374607 -0.725898 -0.565270 0.391845 0.532540 -0.101361 0.840314 973P90.DAT -1 1 -73.803048 -18.088643 -3.243561 -0.435286 0.818655 0.374607 -0.725898 -0.565270 0.391845 0.532540 -0.101361 0.840314 3815B.DAT -1 4 -63.979191 -24.871884 -4.459897 -0.435286 0.758552 0.484896 -0.725898 -0.614303 0.309361 0.532540 -0.217324 0.818029 3817B.DAT -1 2 -63.979191 -24.871884 -4.459897 -0.435286 0.428363 0.791853 -0.725898 -0.687263 -0.027247 0.532540 -0.586664 0.610104 3816B.DAT -1 4 -99.980059 -15.410625 7.177203 -0.570831 0.745015 -0.345114 -0.616711 -0.111555 0.779245 0.542050 0.657653 0.523138 3819.DAT -1 14 -86.492097 -26.787102 15.817264 -0.492707 -0.452554 -0.743259 -0.569329 -0.478312 0.668642 -0.658107 0.752604 -0.021984 3820.DAT -1 2 -86.921465 6.366303 -8.798983 -0.286516 0.803662 -0.521572 -0.813028 0.084048 0.576127 0.506848 0.589121 0.629318 3818.DAT -1 14 -67.419012 5.862090 -6.475175 -0.352700 0.190545 -0.916131 -0.901355 0.193771 0.387314 0.251320 0.962365 0.103406 3820.DAT -1 14 -114.127934 -5.316325 118.658461 -0.125124 0.588664 -0.798636 0.975101 0.221514 0.010503 0.183091 -0.777436 -0.601723 3626BPS5.DAT -1 17 -100.000000 0.000000 100.000000 -0.125124 0.588664 -0.798636 0.975101 0.221514 0.010503 0.183091 -0.777436 -0.601723 973P90.DAT -1 1 -81.162755 7.088434 75.122052 -0.125124 0.588664 -0.798636 0.975101 0.221514 0.010503 0.183091 -0.777436 -0.601723 3815B.DAT -1 4 -74.098787 9.746596 65.792822 -0.125124 0.981514 0.144823 0.975101 0.094721 0.200516 0.183091 0.166306 -0.968927 3817B.DAT -1 2 -74.098787 9.746596 65.792822 -0.125124 0.960075 -0.250198 0.975101 0.165539 0.147565 0.183091 -0.225504 -0.956883 3816B.DAT -1 4 -97.167554 16.398619 96.526884 -0.225444 0.473201 0.851620 0.921821 -0.179297 0.343654 0.315310 0.862516 -0.395785 3819.DAT -1 14 -97.689495 13.944970 116.012961 -0.638308 0.686522 0.348211 0.765739 0.519980 0.378504 0.078789 0.508241 -0.857604 3820.DAT -1 2 -93.413823 -12.854402 91.034142 -0.021003 -0.292587 -0.956008 0.998752 0.037195 -0.033326 0.045310 -0.955515 0.291441 3818.DAT -1 14 -89.699720 -15.917163 71.986178 -0.838067 -0.037549 -0.544273 0.076724 -0.995826 -0.049438 -0.540145 -0.083191 0.837450 3820.DAT -1 14 -8.989189 0.619787 -77.755667 0.927043 0.374550 -0.017452 0.029245 -0.025824 0.999239 0.373814 -0.926847 -0.034894 3626BPS5.DAT -1 17 0.000000 0.000000 -100.000000 0.927043 0.374550 -0.017452 0.029245 -0.025824 0.999239 0.373814 -0.926847 -0.034894 973P90.DAT -1 1 11.985585 -0.826382 -129.659111 0.927043 0.374550 -0.017452 0.029245 -0.025824 0.999239 0.373814 -0.926847 -0.034894 3815B.DAT -1 4 16.480180 -1.136276 -140.781277 0.927043 0.275703 -0.254125 0.029245 0.622516 0.782061 0.373814 -0.732436 0.569035 3817B.DAT -1 2 16.480180 -1.136276 -140.781277 0.927043 0.332081 -0.174109 0.029245 0.398892 0.916532 0.373814 -0.854756 0.360078 3816B.DAT -1 4 16.902036 0.232084 -101.807573 0.847919 0.035933 0.528907 0.033285 -0.999340 0.014532 0.529080 0.005283 -0.848556 3819.DAT -1 14 16.144410 -16.754343 -91.964438 -0.103535 0.918316 0.382069 0.732888 -0.189260 0.653495 0.672425 0.347673 -0.653427 3820.DAT -1 2 -10.909243 -0.645275 -113.021983 0.977999 0.156960 0.137413 0.024317 -0.739986 0.672182 0.207189 -0.654052 -0.727523 3818.DAT -1 14 -13.389637 -19.371951 -118.421916 0.545196 -0.838297 0.004373 -0.117125 -0.071007 0.990575 -0.830086 -0.540570 -0.136898 3820.DAT -1 14 -2.076146 -8.558275 22.325894 -0.010622 0.086506 0.996195 -0.933363 0.356595 -0.040917 -0.358777 -0.930246 0.076954 3626BPS5.DAT -1 17 0.000000 0.000000 0.000000 -0.010622 0.086506 0.996195 -0.933363 0.356595 -0.040917 -0.358777 -0.930246 0.076954 973P90.DAT -1 1 2.768195 11.411033 -29.767859 -0.010622 0.086506 0.996195 -0.933363 0.356595 -0.040917 -0.358777 -0.930246 0.076954 3815B.DAT -1 4 3.806268 15.690171 -40.930806 -0.010622 -0.122505 0.992411 -0.933363 0.357309 0.034117 -0.358777 -0.925917 -0.118137 3817B.DAT -1 2 3.806268 15.690171 -40.930806 -0.010622 0.357743 0.933759 -0.933363 0.331503 -0.137623 -0.358777 -0.872998 0.330383 3816B.DAT -1 4 0.532725 -11.147682 -12.823626 -0.025482 0.541277 0.840458 -0.981105 0.147756 -0.124905 -0.191791 -0.827761 0.527284 3819.DAT -1 14 2.068372 -11.436097 -32.408278 0.767575 0.568569 0.295903 -0.535788 0.822545 -0.190659 -0.351796 -0.012196 0.935997 3820.DAT -1 2 0.851373 16.853199 -2.060303 0.004561 -0.961284 0.275520 -0.857261 0.138099 0.496017 -0.514862 -0.238455 -0.823442 3818.DAT -1 14 -17.988390 18.165772 3.356383 -0.513043 -0.222729 0.828962 0.055909 0.955026 0.291203 -0.856540 0.195746 -0.477517 3820.DAT -1 14 -2.414546 -2.136058 123.782498 -0.292181 0.100606 0.951057 -0.949431 0.089002 -0.301097 -0.114939 -0.990937 0.069514 3626BPS5.DAT -1 17 0.000000 0.000000 100.000000 -0.292181 0.100606 0.951057 -0.949431 0.089002 -0.301097 -0.114939 -0.990937 0.069514 973P90.DAT -1 1 3.219395 2.848078 68.290002 -0.292181 0.100606 0.951057 -0.949431 0.089002 -0.301097 -0.114939 -0.990937 0.069514 3815B.DAT -1 4 4.426668 3.916107 56.398753 -0.292181 -0.801723 0.521411 -0.949431 0.308686 -0.057393 -0.114939 -0.511813 -0.851373 3817B.DAT -1 2 4.426668 3.916107 56.398753 -0.292181 0.067353 0.953988 -0.949431 0.099456 -0.297807 -0.114939 -0.992760 0.034888 3816B.DAT -1 4 -3.577871 -13.529446 90.348423 -0.305212 -0.388699 0.869344 -0.950462 0.067895 -0.303335 0.058882 -0.918860 -0.390166 3819.DAT -1 14 -19.230691 -13.447072 78.474821 0.216025 0.338572 0.915807 -0.273857 0.921315 -0.276010 -0.937195 -0.191175 0.291748 3820.DAT -1 2 5.187568 14.953484 93.796578 -0.270272 -0.933989 -0.233702 -0.919552 0.178495 0.350091 -0.285267 0.309522 -0.907094 3818.DAT -1 14 -7.505838 18.515282 108.363357 0.626126 -0.656084 0.421330 -0.762218 -0.628869 0.153451 0.164285 -0.417225 -0.893831 3820.DAT -1 14 109.413261 -16.071278 -115.136200 0.284964 -0.392219 0.874620 0.740335 0.669637 0.059083 -0.608851 0.630675 0.481196 3626BPS5.DAT -1 17 100.000000 0.000000 -100.000000 0.284964 -0.392219 0.874620 0.740335 0.669637 0.059083 -0.608851 0.630675 0.481196 973P90.DAT -1 1 87.448985 21.428370 -79.818400 0.284964 -0.392219 0.874620 0.740335 0.669637 0.059083 -0.608851 0.630675 0.481196 3815B.DAT -1 4 82.742354 29.464009 -72.250300 0.284964 -0.944419 0.163917 0.740335 0.325474 0.588193 -0.608851 -0.046261 0.791935 3817B.DAT -1 2 82.742354 29.464009 -72.250300 0.284964 -0.538137 0.793224 0.740335 0.649204 0.174467 -0.608851 0.537535 0.583401 3816B.DAT -1 4 101.136705 16.462119 -104.087365 0.348743 -0.862334 -0.367096 0.612807 -0.086549 0.785479 -0.709117 -0.498889 0.498260 3819.DAT -1 14 91.175867 10.372700 -119.889286 0.770850 -0.575512 0.273086 0.287269 0.696688 0.657345 -0.568565 -0.428265 0.702369 3820.DAT -1 2 92.587787 -5.747933 -85.821835 0.212527 -0.647701 -0.731653 0.845369 -0.253662 0.470114 -0.490086 -0.718428 0.493636 3818.DAT -1 14 87.311647 -17.672686 -100.517502 -0.427542 -0.892429 -0.144145 0.732569 -0.435461 0.523179 -0.529670 0.118085 0.839944 3820.DAT -1 14 88.371657 -18.724479 -9.496079 0.874087 0.484514 0.034899 -0.413731 0.780187 -0.469186 -0.254555 0.395670 0.882410 3626BPS5.DAT -1 17 100.000000 0.000000 0.000000 0.874087 0.484514 0.034899 -0.413731 0.780187 -0.469186 -0.254555 0.395670 0.882410 973P90.DAT -1 1 115.504457 24.965973 12.661438 0.874087 0.484514 0.034899 -0.413731 0.780187 -0.469186 -0.254555 0.395670 0.882410 3815B.DAT -1 4 121.318629 34.328212 17.409478 0.874087 0.444185 -0.196651 -0.413731 0.468595 -0.780542 -0.254555 0.763622 0.593366 3817B.DAT -1 2 121.318629 34.328212 17.409478 0.874087 0.453868 -0.173135 -0.413731 0.508803 -0.754948 -0.254555 0.731521 0.632517 3816B.DAT -1 4 116.987418 0.035522 -0.652969 0.776673 0.341446 0.529334 -0.542924 0.788966 0.287692 -0.319395 -0.510831 0.798147 3819.DAT -1 14 121.134676 8.687015 -17.797994 0.977567 0.098792 0.186016 -0.042156 0.957077 -0.286753 -0.206361 0.272478 0.939772 3820.DAT -1 2 90.764811 12.447465 6.983688 0.944943 0.321356 -0.061754 -0.271968 0.666289 -0.694329 -0.181981 0.672896 0.717004 3818.DAT -1 14 93.003887 31.111210 12.697806 0.928238 0.271891 -0.253870 -0.275777 0.044974 -0.960169 -0.249644 0.961277 0.116728 3820.DAT -1 14 84.879118 15.766766 90.061790 0.321020 0.630037 0.707107 0.705871 -0.656949 0.264887 0.631421 0.414092 -0.655618 3626BPS5.DAT -1 17 100.000000 0.000000 100.000000 0.321020 0.630037 0.707107 0.705871 -0.656949 0.264887 0.631421 0.414092 -0.655618 973P90.DAT -1 1 120.161176 -21.022355 113.250946 0.321020 0.630037 0.707107 0.705871 -0.656949 0.264887 0.631421 0.414092 -0.655618 3815B.DAT -1 4 127.721617 -28.905738 118.220051 0.321020 0.642282 0.696003 0.705871 -0.652226 0.276312 0.631421 0.402587 -0.662745 3817B.DAT -1 2 127.721617 -28.905738 118.220051 0.321020 0.240347 0.916067 0.705871 -0.705602 -0.062232 0.631421 0.666603 -0.396166 3816B.DAT -1 4 109.855590 5.332472 112.784055 0.206738 0.975078 -0.080517 0.809225 -0.124157 0.574230 0.549922 -0.183871 -0.814725 3819.DAT -1 14 127.983514 1.290639 119.190456 -0.440909 0.575881 -0.688447 0.253981 0.815729 0.519692 0.860867 0.054284 -0.505925 3820.DAT -1 2 100.224998 -15.843650 93.841418 0.425547 0.755589 0.497990 0.581069 -0.650023 0.489724 0.693735 0.080966 -0.715665 3818.DAT -1 14 106.885912 -33.625824 98.883886 0.864186 0.492266 -0.104201 0.370929 -0.483322 0.792977 0.339993 -0.723930 -0.600275 3820.DAT +1 14 -88.775558 -17.237210 -112.364889 -0.879588 -0.467685 -0.087156 -0.435644 0.718217 0.542567 -0.191154 0.515204 -0.835479 3626BPS5.DAT +1 17 -100.000000 0.000000 -100.000000 -0.879588 -0.467685 -0.087156 -0.435644 0.718217 0.542567 -0.191154 0.515204 -0.835479 973P90.DAT +1 1 -114.965923 22.982947 -83.513481 -0.879588 -0.467685 -0.087156 -0.435644 0.718217 0.542567 -0.191154 0.515204 -0.835479 3815B.DAT +1 4 -120.578144 31.601552 -77.331036 -0.879588 -0.472626 -0.054319 -0.435644 0.754315 0.491145 -0.191154 0.455669 -0.869383 3817B.DAT +1 2 -120.578144 31.601552 -77.331036 -0.879588 -0.295787 -0.372606 -0.435644 0.186090 0.880673 -0.191154 0.936953 -0.292540 3816B.DAT +1 4 -116.935296 -0.788925 -98.745673 -0.785012 -0.318241 -0.531487 -0.553743 -0.024139 0.832338 -0.277714 0.947702 -0.157275 3819.DAT +1 14 -120.702062 -10.905296 -82.330116 -0.935033 0.290987 -0.202581 0.092396 0.751593 0.653124 0.342309 0.591975 -0.729651 3820.DAT +1 2 -90.547665 12.280398 -93.011067 -0.947437 -0.290417 -0.134240 -0.304309 0.688439 0.658368 -0.098785 0.664613 -0.740629 3818.DAT +1 14 -90.486845 19.275786 -74.651850 -0.388551 -0.917605 0.083843 -0.917045 0.393962 0.061819 -0.089756 -0.052868 -0.994560 3820.DAT +1 14 -107.148270 -20.457153 10.315383 -0.342631 0.297845 -0.891007 0.515696 0.852381 0.086625 0.785278 -0.429808 -0.445649 3626BPS5.DAT +1 17 -100.000000 0.000000 0.000000 -0.342631 0.297845 -0.891007 0.515696 0.852381 0.086625 0.785278 -0.429808 -0.445649 973P90.DAT +1 1 -90.468974 27.276204 -13.753844 -0.342631 0.297845 -0.891007 0.515696 0.852381 0.086625 0.785278 -0.429808 -0.445649 3815B.DAT +1 4 -86.894839 37.504781 -18.911535 -0.342631 0.634500 -0.692831 0.515696 0.743455 0.425831 0.785278 -0.211387 -0.581940 3817B.DAT +1 2 -86.894839 37.504781 -18.911535 -0.342631 -0.532342 -0.774090 0.515696 0.582158 -0.628610 0.785278 -0.614576 0.075061 3816B.DAT +1 4 -102.756708 14.554486 8.340714 -0.389146 -0.393610 -0.832849 0.359847 0.767323 -0.530779 0.847983 -0.506248 -0.156961 3819.DAT +1 14 -103.509016 33.815369 4.539082 0.331669 -0.861265 -0.384992 0.072563 0.430172 -0.899826 0.940601 0.270508 0.205171 3820.DAT +1 2 -92.477779 -0.916384 -15.217635 -0.285705 -0.238286 -0.928220 0.655876 0.657585 -0.370688 0.698713 -0.714704 -0.031590 3818.DAT +1 14 -87.031833 10.975246 -29.878154 -0.785341 -0.268323 -0.557891 0.619061 -0.342648 -0.706651 -0.001550 -0.900331 0.435204 3820.DAT +1 14 -117.261526 1.753198 83.417900 -0.694553 0.719230 0.017452 -0.050617 -0.073050 0.996043 0.717659 0.690921 0.087142 3626BPS5.DAT +1 17 -100.000000 0.000000 100.000000 -0.694553 0.719230 0.017452 -0.050617 -0.073050 0.996043 0.717659 0.690921 0.087142 973P90.DAT +1 1 -76.984632 -2.337597 122.109466 -0.694553 0.719230 0.017452 -0.050617 -0.073050 0.996043 0.717659 0.690921 0.087142 3815B.DAT +1 4 -68.353869 -3.214196 130.400516 -0.694553 0.520913 -0.496232 -0.050617 0.652655 0.755963 0.717659 0.550174 -0.426936 3817B.DAT +1 2 -68.353869 -3.214196 130.400516 -0.694553 0.699240 -0.169293 -0.050617 0.187234 0.981010 0.717659 0.689932 -0.094650 3816B.DAT +1 4 -104.664447 -1.343658 116.292253 -0.808894 0.522471 -0.269656 -0.037163 0.412283 0.910297 0.586779 0.746355 -0.314077 3819.DAT +1 14 -96.591102 -2.676169 134.154099 -0.485833 0.685391 -0.542407 0.538108 0.723561 0.432318 0.688771 -0.081840 -0.720345 3820.DAT +1 2 -83.827870 0.174860 94.762480 -0.559108 0.155269 0.814426 -0.062533 -0.987407 0.145318 0.826733 0.030320 0.561776 3818.DAT +1 14 -86.281696 -17.668788 86.914999 -0.849560 -0.059889 0.524081 0.491853 -0.448938 0.746013 0.190602 0.891554 0.410856 3820.DAT +1 14 18.512478 -15.237310 -101.054783 -0.094710 -0.771353 -0.629320 -0.182808 0.634888 -0.750665 0.978576 0.043949 -0.201140 3626BPS5.DAT +1 17 0.000000 0.000000 -100.000000 -0.094710 -0.771353 -0.629320 -0.182808 0.634888 -0.750665 0.978576 0.043949 -0.201140 973P90.DAT +1 1 -24.683303 20.316413 -98.593623 -0.094710 -0.771353 -0.629320 -0.182808 0.634888 -0.750665 0.978576 0.043949 -0.201140 3815B.DAT +1 4 -33.939542 27.935068 -98.066232 -0.094710 -0.737360 -0.668827 -0.182808 0.673305 -0.716409 0.978576 0.054416 -0.198564 3817B.DAT +1 2 -33.939542 27.935068 -98.066232 -0.094710 -0.676262 -0.730548 -0.182808 0.733182 -0.655001 0.978576 0.071515 -0.193066 3816B.DAT +1 4 -7.591480 2.336979 -84.969765 0.040673 0.890573 -0.453018 -0.290278 0.444369 0.847511 0.956078 0.097031 0.276588 3819.DAT +1 14 11.788115 1.102551 -81.985224 0.213761 0.329941 -0.919481 0.143222 0.920481 0.363596 0.966330 -0.209412 0.149508 3820.DAT +1 2 -4.750172 7.821228 -114.327047 -0.227215 -0.264220 -0.937316 -0.069784 0.964434 -0.254947 0.971341 0.007482 -0.237573 3818.DAT +1 14 0.102800 26.790260 -115.947071 0.776739 -0.310106 -0.548189 -0.579067 -0.009306 -0.815227 0.247705 0.950657 -0.186800 3820.DAT +1 14 -12.623264 -1.653075 -20.345038 -0.841727 0.525969 0.121869 0.184976 0.068878 0.980326 0.507227 0.847710 -0.155268 3626BPS5.DAT +1 17 0.000000 0.000000 0.000000 -0.841727 0.525969 0.121869 0.184976 0.068878 0.980326 0.507227 0.847710 -0.155268 973P90.DAT +1 1 16.831018 2.204100 27.126717 -0.841727 0.525969 0.121869 0.184976 0.068878 0.980326 0.507227 0.847710 -0.155268 3815B.DAT +1 4 23.142650 3.030638 37.299235 -0.841727 -0.121869 0.525969 0.184976 -0.980326 0.068878 0.507227 0.155268 0.847710 3817B.DAT +1 2 23.142650 3.030638 37.299235 -0.841727 -0.112671 0.528016 0.184976 -0.978975 0.085977 0.507227 0.170039 0.844871 3816B.DAT +1 4 -8.418149 3.325669 14.390090 -0.920273 0.335908 -0.200658 0.170206 0.805436 0.567717 0.352318 0.488301 -0.798395 3819.DAT +1 14 -4.582876 12.589459 31.286033 -0.700613 -0.610340 -0.369631 -0.629401 0.772654 -0.082828 0.336150 0.174615 -0.925480 3820.DAT +1 2 16.833658 -2.223619 -0.826732 -0.737606 0.643618 -0.204192 0.194127 0.491766 0.848811 0.646725 0.586449 -0.487673 3818.DAT +1 14 32.563308 -2.279404 10.945056 -0.777388 -0.265743 -0.570130 -0.514911 0.789447 0.334126 0.361295 0.553312 -0.750541 3820.DAT +1 14 -6.762709 22.390022 94.619232 0.577734 0.281780 -0.766044 -0.021587 -0.932918 -0.359442 -0.815940 0.224199 -0.532895 3626BPS5.DAT +1 17 0.000000 0.000000 100.000000 0.577734 0.281780 -0.766044 -0.021587 -0.932918 -0.359442 -0.815940 0.224199 -0.532895 973P90.DAT +1 1 9.016945 -29.853363 107.174357 0.577734 0.281780 -0.766044 -0.021587 -0.932918 -0.359442 -0.815940 0.224199 -0.532895 3815B.DAT +1 4 12.398300 -41.048374 109.864741 0.577734 0.059713 -0.814038 -0.021587 -0.995854 -0.088371 -0.815940 0.068628 -0.574049 3817B.DAT +1 2 12.398300 -41.048374 109.864741 0.577734 0.810476 -0.096709 -0.021587 -0.103270 -0.994419 -0.815940 0.576597 -0.042167 3816B.DAT +1 4 10.920241 -7.787149 89.554492 0.520026 -0.397665 -0.755933 0.140740 -0.833023 0.535038 -0.842476 -0.384624 -0.377226 3819.DAT +1 14 13.043435 -26.200914 83.041020 -0.379771 -0.866686 -0.323464 -0.170098 -0.278277 0.945319 -0.909308 0.414026 -0.041741 3820.DAT +1 2 -6.411769 -7.139533 114.032687 0.617887 0.785206 -0.040838 -0.183259 0.093311 -0.978626 -0.764612 0.612164 0.201551 3818.DAT +1 14 4.832717 3.987426 125.683967 0.674633 0.507514 -0.536004 -0.240537 -0.535358 -0.809650 -0.697863 0.675145 -0.239094 3820.DAT +1 14 100.686112 -10.510433 -121.565251 -0.020018 -0.028588 0.999391 0.898488 0.437935 0.030524 -0.438541 0.898552 0.016920 3626BPS5.DAT +1 17 100.000000 0.000000 -100.000000 -0.020018 -0.028588 0.999391 0.898488 0.437935 0.030524 -0.438541 0.898552 0.016920 973P90.DAT +1 1 99.085184 14.013911 -71.246332 -0.020018 -0.028588 0.999391 0.898488 0.437935 0.030524 -0.438541 0.898552 0.016920 3815B.DAT +1 4 98.742128 19.269127 -60.463707 -0.020018 -0.132896 0.990928 0.898488 0.432345 0.076133 -0.438541 0.891861 0.110751 3817B.DAT +1 2 98.742128 19.269127 -60.463707 -0.020018 -0.989172 0.145389 0.898488 0.045987 0.436582 -0.438541 0.139369 0.887839 3816B.DAT +1 4 99.471033 16.980804 -99.389691 -0.014749 -0.889421 0.456850 0.808792 0.258033 0.528464 -0.587910 0.377291 0.715551 3819.DAT +1 14 80.180221 19.846355 -101.767339 0.328365 -0.206612 0.921677 -0.060967 0.969112 0.238967 -0.942581 -0.134661 0.305626 3820.DAT +1 2 100.071559 -9.973849 -86.233475 -0.024678 0.097301 0.994949 0.960885 0.276929 -0.003250 -0.275846 0.955951 -0.100329 3818.DAT +1 14 92.869852 -9.080354 -67.975953 -0.429793 0.570784 0.699631 0.666631 0.723205 -0.180496 -0.609000 0.388820 -0.691330 3820.DAT +1 14 122.738499 -6.662688 -3.816968 -0.082890 -0.947437 0.309017 0.267134 0.277612 0.922806 -0.960088 0.159040 0.230081 3626BPS5.DAT +1 17 100.000000 0.000000 0.000000 -0.082890 -0.947437 0.309017 0.267134 0.277612 0.922806 -0.960088 0.159040 0.230081 973P90.DAT +1 1 69.682001 8.883584 5.089291 -0.082890 -0.947437 0.309017 0.267134 0.277612 0.922806 -0.960088 0.159040 0.230081 3815B.DAT +1 4 58.312752 12.214929 6.997775 -0.082890 -0.989266 -0.120340 0.267134 -0.138393 0.953670 -0.960088 0.046903 0.275738 3817B.DAT +1 2 58.312752 12.214929 6.997775 -0.082890 -0.773767 0.628023 0.267134 0.589877 0.762026 -0.960088 0.230931 0.157805 3816B.DAT +1 4 91.177150 6.227905 -13.128995 0.082890 -0.862485 0.499248 0.214869 0.504656 0.836154 -0.973119 0.037964 0.227152 3819.DAT +1 14 72.353230 8.141143 -18.420455 0.330119 -0.115547 0.936841 -0.657955 0.683482 0.316145 -0.676844 -0.720764 0.149606 3820.DAT +1 2 93.663851 -1.786112 15.673641 -0.246152 0.023816 -0.968939 0.311282 -0.944795 -0.102301 -0.917885 -0.326795 0.225149 3818.DAT +1 14 103.773775 -18.172046 11.763319 0.284581 -0.587468 -0.757559 0.795011 -0.296959 0.528935 -0.535697 -0.752793 0.382534 3820.DAT +1 14 123.230371 4.506410 95.994738 0.241333 -0.967932 -0.069756 -0.879494 -0.187767 -0.437303 0.410182 0.166886 -0.896605 3626BPS5.DAT +1 17 100.000000 0.000000 100.000000 0.241333 -0.967932 -0.069756 -0.879494 -0.187767 -0.437303 0.410182 0.166886 -0.896605 973P90.DAT +1 1 69.026172 -6.008546 105.340350 0.241333 -0.967932 -0.069756 -0.879494 -0.187767 -0.437303 0.410182 0.166886 -0.896605 3815B.DAT +1 4 57.410986 -8.261751 107.342981 0.241333 -0.783888 -0.572083 -0.879494 0.072500 -0.470356 0.410182 0.616655 -0.671928 3817B.DAT +1 2 57.410986 -8.261751 107.342981 0.241333 -0.966567 -0.086639 -0.879494 -0.180106 -0.440514 0.410182 0.182508 -0.893556 3816B.DAT +1 4 95.876532 -14.694544 107.487817 0.405746 -0.888273 0.215271 -0.833527 -0.456246 -0.311565 0.374971 -0.053018 -0.925519 3819.DAT +1 14 80.461437 -22.980752 116.416065 0.433560 -0.520105 0.735878 -0.803612 -0.592645 0.054597 0.407718 -0.615031 -0.674909 3820.DAT +1 2 88.636554 11.690271 95.182358 0.069587 -0.104106 -0.992129 -0.898738 0.425070 -0.107640 0.432930 0.899154 -0.063985 3818.DAT +1 14 95.517557 23.480163 109.312122 -0.030944 -0.720180 -0.693096 -0.854303 0.379017 -0.355686 0.518854 0.581108 -0.626981 3820.DAT diff --git a/tests/test_data/examples/spaceman.py3.ldr b/tests/test_data/examples/spaceman.py3.ldr deleted file mode 100644 index 7278ae3d..00000000 --- a/tests/test_data/examples/spaceman.py3.ldr +++ /dev/null @@ -1,81 +0,0 @@ -1 14 -88.775558 -17.237210 -112.364889 -0.879588 -0.467685 -0.087156 -0.435644 0.718217 0.542567 -0.191154 0.515204 -0.835479 3626BPS5.DAT -1 17 -100.000000 0.000000 -100.000000 -0.879588 -0.467685 -0.087156 -0.435644 0.718217 0.542567 -0.191154 0.515204 -0.835479 973P90.DAT -1 1 -114.965923 22.982947 -83.513481 -0.879588 -0.467685 -0.087156 -0.435644 0.718217 0.542567 -0.191154 0.515204 -0.835479 3815B.DAT -1 4 -120.578144 31.601552 -77.331036 -0.879588 -0.472626 -0.054319 -0.435644 0.754315 0.491145 -0.191154 0.455669 -0.869383 3817B.DAT -1 2 -120.578144 31.601552 -77.331036 -0.879588 -0.295787 -0.372606 -0.435644 0.186090 0.880673 -0.191154 0.936953 -0.292540 3816B.DAT -1 4 -116.935296 -0.788925 -98.745673 -0.785012 -0.318241 -0.531487 -0.553743 -0.024139 0.832338 -0.277714 0.947702 -0.157275 3819.DAT -1 14 -120.702062 -10.905296 -82.330116 -0.935033 0.290987 -0.202581 0.092396 0.751593 0.653124 0.342309 0.591975 -0.729651 3820.DAT -1 2 -90.547665 12.280398 -93.011067 -0.947437 -0.290417 -0.134240 -0.304309 0.688439 0.658368 -0.098785 0.664613 -0.740629 3818.DAT -1 14 -90.486845 19.275786 -74.651850 -0.388551 -0.917605 0.083843 -0.917045 0.393962 0.061819 -0.089756 -0.052868 -0.994560 3820.DAT -1 14 -107.148270 -20.457153 10.315383 -0.342631 0.297845 -0.891007 0.515696 0.852381 0.086625 0.785278 -0.429808 -0.445649 3626BPS5.DAT -1 17 -100.000000 0.000000 0.000000 -0.342631 0.297845 -0.891007 0.515696 0.852381 0.086625 0.785278 -0.429808 -0.445649 973P90.DAT -1 1 -90.468974 27.276204 -13.753844 -0.342631 0.297845 -0.891007 0.515696 0.852381 0.086625 0.785278 -0.429808 -0.445649 3815B.DAT -1 4 -86.894839 37.504781 -18.911535 -0.342631 0.634500 -0.692831 0.515696 0.743455 0.425831 0.785278 -0.211387 -0.581940 3817B.DAT -1 2 -86.894839 37.504781 -18.911535 -0.342631 -0.532342 -0.774090 0.515696 0.582158 -0.628610 0.785278 -0.614576 0.075061 3816B.DAT -1 4 -102.756708 14.554486 8.340714 -0.389146 -0.393610 -0.832849 0.359847 0.767323 -0.530779 0.847983 -0.506248 -0.156961 3819.DAT -1 14 -103.509016 33.815369 4.539082 0.331669 -0.861265 -0.384992 0.072563 0.430172 -0.899826 0.940601 0.270508 0.205171 3820.DAT -1 2 -92.477779 -0.916384 -15.217635 -0.285705 -0.238286 -0.928220 0.655876 0.657585 -0.370688 0.698713 -0.714704 -0.031590 3818.DAT -1 14 -87.031833 10.975246 -29.878154 -0.785341 -0.268323 -0.557891 0.619061 -0.342648 -0.706651 -0.001550 -0.900331 0.435204 3820.DAT -1 14 -117.261526 1.753198 83.417900 -0.694553 0.719230 0.017452 -0.050617 -0.073050 0.996043 0.717659 0.690921 0.087142 3626BPS5.DAT -1 17 -100.000000 0.000000 100.000000 -0.694553 0.719230 0.017452 -0.050617 -0.073050 0.996043 0.717659 0.690921 0.087142 973P90.DAT -1 1 -76.984632 -2.337597 122.109466 -0.694553 0.719230 0.017452 -0.050617 -0.073050 0.996043 0.717659 0.690921 0.087142 3815B.DAT -1 4 -68.353869 -3.214196 130.400516 -0.694553 0.520913 -0.496232 -0.050617 0.652655 0.755963 0.717659 0.550174 -0.426936 3817B.DAT -1 2 -68.353869 -3.214196 130.400516 -0.694553 0.699240 -0.169293 -0.050617 0.187234 0.981010 0.717659 0.689932 -0.094650 3816B.DAT -1 4 -104.664447 -1.343658 116.292253 -0.808894 0.522471 -0.269656 -0.037163 0.412283 0.910297 0.586779 0.746355 -0.314077 3819.DAT -1 14 -96.591102 -2.676169 134.154099 -0.485833 0.685391 -0.542407 0.538108 0.723561 0.432318 0.688771 -0.081840 -0.720345 3820.DAT -1 2 -83.827870 0.174860 94.762480 -0.559108 0.155269 0.814426 -0.062533 -0.987407 0.145318 0.826733 0.030320 0.561776 3818.DAT -1 14 -86.281696 -17.668788 86.914999 -0.849560 -0.059889 0.524081 0.491853 -0.448938 0.746013 0.190602 0.891554 0.410856 3820.DAT -1 14 18.512478 -15.237310 -101.054783 -0.094710 -0.771353 -0.629320 -0.182808 0.634888 -0.750665 0.978576 0.043949 -0.201140 3626BPS5.DAT -1 17 0.000000 0.000000 -100.000000 -0.094710 -0.771353 -0.629320 -0.182808 0.634888 -0.750665 0.978576 0.043949 -0.201140 973P90.DAT -1 1 -24.683303 20.316413 -98.593623 -0.094710 -0.771353 -0.629320 -0.182808 0.634888 -0.750665 0.978576 0.043949 -0.201140 3815B.DAT -1 4 -33.939542 27.935068 -98.066232 -0.094710 -0.737360 -0.668827 -0.182808 0.673305 -0.716409 0.978576 0.054416 -0.198564 3817B.DAT -1 2 -33.939542 27.935068 -98.066232 -0.094710 -0.676262 -0.730548 -0.182808 0.733182 -0.655001 0.978576 0.071515 -0.193066 3816B.DAT -1 4 -7.591480 2.336979 -84.969765 0.040673 0.890573 -0.453018 -0.290278 0.444369 0.847511 0.956078 0.097031 0.276588 3819.DAT -1 14 11.788115 1.102551 -81.985224 0.213761 0.329941 -0.919481 0.143222 0.920481 0.363596 0.966330 -0.209412 0.149508 3820.DAT -1 2 -4.750172 7.821228 -114.327047 -0.227215 -0.264220 -0.937316 -0.069784 0.964434 -0.254947 0.971341 0.007482 -0.237573 3818.DAT -1 14 0.102800 26.790260 -115.947071 0.776739 -0.310106 -0.548189 -0.579067 -0.009306 -0.815227 0.247705 0.950657 -0.186800 3820.DAT -1 14 -12.623264 -1.653075 -20.345038 -0.841727 0.525969 0.121869 0.184976 0.068878 0.980326 0.507227 0.847710 -0.155268 3626BPS5.DAT -1 17 0.000000 0.000000 0.000000 -0.841727 0.525969 0.121869 0.184976 0.068878 0.980326 0.507227 0.847710 -0.155268 973P90.DAT -1 1 16.831018 2.204100 27.126717 -0.841727 0.525969 0.121869 0.184976 0.068878 0.980326 0.507227 0.847710 -0.155268 3815B.DAT -1 4 23.142650 3.030638 37.299235 -0.841727 -0.121869 0.525969 0.184976 -0.980326 0.068878 0.507227 0.155268 0.847710 3817B.DAT -1 2 23.142650 3.030638 37.299235 -0.841727 -0.112671 0.528016 0.184976 -0.978975 0.085977 0.507227 0.170039 0.844871 3816B.DAT -1 4 -8.418149 3.325669 14.390090 -0.920273 0.335908 -0.200658 0.170206 0.805436 0.567717 0.352318 0.488301 -0.798395 3819.DAT -1 14 -4.582876 12.589459 31.286033 -0.700613 -0.610340 -0.369631 -0.629401 0.772654 -0.082828 0.336150 0.174615 -0.925480 3820.DAT -1 2 16.833658 -2.223619 -0.826732 -0.737606 0.643618 -0.204192 0.194127 0.491766 0.848811 0.646725 0.586449 -0.487673 3818.DAT -1 14 32.563308 -2.279404 10.945056 -0.777388 -0.265743 -0.570130 -0.514911 0.789447 0.334126 0.361295 0.553312 -0.750541 3820.DAT -1 14 -6.762709 22.390022 94.619232 0.577734 0.281780 -0.766044 -0.021587 -0.932918 -0.359442 -0.815940 0.224199 -0.532895 3626BPS5.DAT -1 17 0.000000 0.000000 100.000000 0.577734 0.281780 -0.766044 -0.021587 -0.932918 -0.359442 -0.815940 0.224199 -0.532895 973P90.DAT -1 1 9.016945 -29.853363 107.174357 0.577734 0.281780 -0.766044 -0.021587 -0.932918 -0.359442 -0.815940 0.224199 -0.532895 3815B.DAT -1 4 12.398300 -41.048374 109.864741 0.577734 0.059713 -0.814038 -0.021587 -0.995854 -0.088371 -0.815940 0.068628 -0.574049 3817B.DAT -1 2 12.398300 -41.048374 109.864741 0.577734 0.810476 -0.096709 -0.021587 -0.103270 -0.994419 -0.815940 0.576597 -0.042167 3816B.DAT -1 4 10.920241 -7.787149 89.554492 0.520026 -0.397665 -0.755933 0.140740 -0.833023 0.535038 -0.842476 -0.384624 -0.377226 3819.DAT -1 14 13.043435 -26.200914 83.041020 -0.379771 -0.866686 -0.323464 -0.170098 -0.278277 0.945319 -0.909308 0.414026 -0.041741 3820.DAT -1 2 -6.411769 -7.139533 114.032687 0.617887 0.785206 -0.040838 -0.183259 0.093311 -0.978626 -0.764612 0.612164 0.201551 3818.DAT -1 14 4.832717 3.987426 125.683967 0.674633 0.507514 -0.536004 -0.240537 -0.535358 -0.809650 -0.697863 0.675145 -0.239094 3820.DAT -1 14 100.686112 -10.510433 -121.565251 -0.020018 -0.028588 0.999391 0.898488 0.437935 0.030524 -0.438541 0.898552 0.016920 3626BPS5.DAT -1 17 100.000000 0.000000 -100.000000 -0.020018 -0.028588 0.999391 0.898488 0.437935 0.030524 -0.438541 0.898552 0.016920 973P90.DAT -1 1 99.085184 14.013911 -71.246332 -0.020018 -0.028588 0.999391 0.898488 0.437935 0.030524 -0.438541 0.898552 0.016920 3815B.DAT -1 4 98.742128 19.269127 -60.463707 -0.020018 -0.132896 0.990928 0.898488 0.432345 0.076133 -0.438541 0.891861 0.110751 3817B.DAT -1 2 98.742128 19.269127 -60.463707 -0.020018 -0.989172 0.145389 0.898488 0.045987 0.436582 -0.438541 0.139369 0.887839 3816B.DAT -1 4 99.471033 16.980804 -99.389691 -0.014749 -0.889421 0.456850 0.808792 0.258033 0.528464 -0.587910 0.377291 0.715551 3819.DAT -1 14 80.180221 19.846355 -101.767339 0.328365 -0.206612 0.921677 -0.060967 0.969112 0.238967 -0.942581 -0.134661 0.305626 3820.DAT -1 2 100.071559 -9.973849 -86.233475 -0.024678 0.097301 0.994949 0.960885 0.276929 -0.003250 -0.275846 0.955951 -0.100329 3818.DAT -1 14 92.869852 -9.080354 -67.975953 -0.429793 0.570784 0.699631 0.666631 0.723205 -0.180496 -0.609000 0.388820 -0.691330 3820.DAT -1 14 122.738499 -6.662688 -3.816968 -0.082890 -0.947437 0.309017 0.267134 0.277612 0.922806 -0.960088 0.159040 0.230081 3626BPS5.DAT -1 17 100.000000 0.000000 0.000000 -0.082890 -0.947437 0.309017 0.267134 0.277612 0.922806 -0.960088 0.159040 0.230081 973P90.DAT -1 1 69.682001 8.883584 5.089291 -0.082890 -0.947437 0.309017 0.267134 0.277612 0.922806 -0.960088 0.159040 0.230081 3815B.DAT -1 4 58.312752 12.214929 6.997775 -0.082890 -0.989266 -0.120340 0.267134 -0.138393 0.953670 -0.960088 0.046903 0.275738 3817B.DAT -1 2 58.312752 12.214929 6.997775 -0.082890 -0.773767 0.628023 0.267134 0.589877 0.762026 -0.960088 0.230931 0.157805 3816B.DAT -1 4 91.177150 6.227905 -13.128995 0.082890 -0.862485 0.499248 0.214869 0.504656 0.836154 -0.973119 0.037964 0.227152 3819.DAT -1 14 72.353230 8.141143 -18.420455 0.330119 -0.115547 0.936841 -0.657955 0.683482 0.316145 -0.676844 -0.720764 0.149606 3820.DAT -1 2 93.663851 -1.786112 15.673641 -0.246152 0.023816 -0.968939 0.311282 -0.944795 -0.102301 -0.917885 -0.326795 0.225149 3818.DAT -1 14 103.773775 -18.172046 11.763319 0.284581 -0.587468 -0.757559 0.795011 -0.296959 0.528935 -0.535697 -0.752793 0.382534 3820.DAT -1 14 123.230371 4.506410 95.994738 0.241333 -0.967932 -0.069756 -0.879494 -0.187767 -0.437303 0.410182 0.166886 -0.896605 3626BPS5.DAT -1 17 100.000000 0.000000 100.000000 0.241333 -0.967932 -0.069756 -0.879494 -0.187767 -0.437303 0.410182 0.166886 -0.896605 973P90.DAT -1 1 69.026172 -6.008546 105.340350 0.241333 -0.967932 -0.069756 -0.879494 -0.187767 -0.437303 0.410182 0.166886 -0.896605 3815B.DAT -1 4 57.410986 -8.261751 107.342981 0.241333 -0.783888 -0.572083 -0.879494 0.072500 -0.470356 0.410182 0.616655 -0.671928 3817B.DAT -1 2 57.410986 -8.261751 107.342981 0.241333 -0.966567 -0.086639 -0.879494 -0.180106 -0.440514 0.410182 0.182508 -0.893556 3816B.DAT -1 4 95.876532 -14.694544 107.487817 0.405746 -0.888273 0.215271 -0.833527 -0.456246 -0.311565 0.374971 -0.053018 -0.925519 3819.DAT -1 14 80.461437 -22.980752 116.416065 0.433560 -0.520105 0.735878 -0.803612 -0.592645 0.054597 0.407718 -0.615031 -0.674909 3820.DAT -1 2 88.636554 11.690271 95.182358 0.069587 -0.104106 -0.992129 -0.898738 0.425070 -0.107640 0.432930 0.899154 -0.063985 3818.DAT -1 14 95.517557 23.480163 109.312122 -0.030944 -0.720180 -0.693096 -0.854303 0.379017 -0.355686 0.518854 0.581108 -0.626981 3820.DAT diff --git a/tests/test_examples.py b/tests/test_examples.py index 349a7a8f..68c0a3c0 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -3,12 +3,13 @@ import os import sys import tempfile +from io import StringIO import mock import pytest from ldraw import CustomImporter -from ldraw.compat import StringIO, do_execfile, PY2 +from ldraw.compat import do_execfile @pytest.fixture(scope='module') @@ -17,10 +18,10 @@ def mocked_parts_lst(): library_path = tempfile.mkdtemp() def get_config(): return { - 'parts.lst': parts_lst_path, - 'library': library_path, - 'others_threshold': 0 - } + 'parts.lst': parts_lst_path, + 'library': library_path, + 'others_threshold': 0 + } with mock.patch('ldraw.parts.get_config', side_effect=get_config): CustomImporter().load_module('ldraw.library') @@ -66,9 +67,6 @@ def exec_example(name, save=False): do_execfile(script_file, d, d) content = s.getvalue() expected_path = os.path.join('tests', 'test_data', 'examples', '%s.ldr' % name) - expected_path_py3 = os.path.join('tests', 'test_data', 'examples', '%s.py3.ldr' % name) - if not PY2 and os.path.exists(expected_path_py3): - expected_path = expected_path_py3 # uncomment to save # open(expected_path, 'w').write(content) diff --git a/tox.ini b/tox.ini index 521d1c4f..624d2bfc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py35, py36, py37, py38 +envlist = py35, py36, py37, py38 [testenv] passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH