XASY: Move xasy files and imports for compatibility with PEP 517 pack…

…aging system.

GUI/ContextWindow.py → GUI/xasygui/ContextWindow.py

@@ -3,25 +3,8 @@
 import PyQt5.QtWidgets as Qw
 import PyQt5.QtGui as Qg
 import PyQt5.QtCore as Qc
-import xasyVersion
-
-import xasyUtils as xu
-import xasy2asy as x2a
-import xasyFile as xf
-import xasyOptions as xo
-import UndoRedoStack as Urs
-import xasyArgs as xa
-import xasyBezierInterface as xbi
-from xasyTransform import xasyTransform as xT
-import xasyStrings as xs
-
-import PrimitiveShape
-import InplaceAddObj
-
-import CustMatTransform
-import SetCustomAnchor
-import GuidesManager
-import time
+from . import xasy2asy as x2a
+from .xasyTransform import xasyTransform as xT
 
 class AnotherWindow(Qw.QWidget):
  def __init__(self, shape, parent):

GUI/CustMatTransform.py → GUI/xasygui/CustMatTransform.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
-import PyQt5.QtWidgets as QtWidgets
-import PyQt5.QtGui as QtGui
 import PyQt5.QtCore as QtCore
+import PyQt5.QtGui as QtGui
+import PyQt5.QtWidgets as QtWidgets
 import numpy as numpy
-import xasy2asy as xasy2asy
-from pyUIClass.custMatTransform import Ui_Dialog
+
+from xasyqtui.custMatTransform import Ui_Dialog
+from . import xasy2asy
 
 
 class CustMatTransform(QtWidgets.QDialog):

GUI/InplaceAddObj.py → GUI/xasygui/InplaceAddObj.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python3
+import math
 
 import PyQt5.QtCore as QtCore
 import PyQt5.QtGui as QtGui
-import xasy2asy as xasy2asy
-
-import PrimitiveShape
-import math
 
-import Widg_addPolyOpt
-import Widg_addLabel
+from . import PrimitiveShape, Widg_addLabel, Widg_addPolyOpt, xasy2asy as xasy2asy
 
 
 class InplaceObjProcess(QtCore.QObject):

GUI/PrimitiveShape.py → GUI/xasygui/PrimitiveShape.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
-import xasy2asy as xasy2asy
-import numpy as numpy
 import math
+
 import PyQt5.QtCore as QtCore
 import PyQt5.QtGui as QtGui
+import numpy as numpy
+
+from . import xasy2asy
 
 
 class PrimitiveShape:

GUI/SetCustomAnchor.py → GUI/xasygui/SetCustomAnchor.py

@@ -3,7 +3,7 @@
 import PyQt5.QtWidgets as QtWidgets
 import PyQt5.QtGui as QtGui
 import PyQt5.QtCore as QtCore
-from pyUIClass.setCustomAnchor import Ui_Dialog
+from xasyqtui.setCustomAnchor import Ui_Dialog
 
 
 class CustomAnchorDialog(QtWidgets.QDialog):

GUI/Widg_addLabel.py → GUI/xasygui/Widg_addLabel.py

@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
-
-from pyUIClass.widg_addLabel import Ui_Form
-import PyQt5.QtWidgets as QtWidgets
 import PyQt5.QtGui as QtGui
+import PyQt5.QtWidgets as QtWidgets
 
-import labelEditor
-import xasyUtils as xu
+from xasyqtui.widg_addLabel import Ui_Form
+from . import labelEditor, xasyUtils as xu
 
 
 class Widg_addLabel(QtWidgets.QWidget):

GUI/Widg_addPolyOpt.py → GUI/xasygui/Widg_addPolyOpt.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-from pyUIClass.widg_addPolyOpt import Ui_Form
-import PyQt5.QtWidgets as QtWidgets
+
 import PyQt5.QtGui as QtGui
+import PyQt5.QtWidgets as QtWidgets
 
-import sys
+from xasyqtui.widg_addPolyOpt import Ui_Form
 
 
 class Widg_addPolyOpt(QtWidgets.QWidget):

GUI/Widg_editBezier.py → GUI/xasygui/Widg_editBezier.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
-from pyUIClass.widg_editBezier import Ui_Form
 
 import PyQt5.QtWidgets as QtWidgets
 import PyQt5.QtCore as QtCore
 
+from xasyqtui.widg_editBezier import Ui_Form
+
+
 class LockMode:
  noLock = 0
  angleLock = 1

GUI/Window1.py → GUI/xasygui/Window1.py

@@ -1,42 +1,36 @@
 #!/usr/bin/env python3
 
-from pyUIClass.window1 import Ui_MainWindow
-
-import PyQt5.QtWidgets as Qw
-import PyQt5.QtGui as Qg
-import PyQt5.QtCore as Qc
-import xasyVersion
-
-import numpy as np
-import os
-import json
+import atexit
+import datetime
 import io
-import pathlib
-import webbrowser
+import os
+import pickle
+import string
 import subprocess
 import tempfile
-import datetime
-import string
-import atexit
-import pickle
-
-import xasyUtils as xu
-import xasy2asy as x2a
-import xasyFile as xf
-import xasyOptions as xo
-import UndoRedoStack as Urs
-import xasyArgs as xa
-import xasyBezierInterface as xbi
-from xasyTransform import xasyTransform as xT
-import xasyStrings as xs
+import webbrowser
 
-import PrimitiveShape
-import InplaceAddObj
-import ContextWindow
+import PyQt5.QtCore as Qc
+import PyQt5.QtGui as Qg
+import PyQt5.QtWidgets as Qw
+import numpy as np
 
-import CustMatTransform
-import SetCustomAnchor
-import GuidesManager
+from xasyqtui.window1 import Ui_MainWindow
+from xasyversion.version import VERSION
+from . import (
+ ContextWindow,
+ CustMatTransform,
+ InplaceAddObj,
+ UndoRedoStack as Urs,
+ xasy2asy as x2a,
+ xasyArgs as xa,
+ xasyBezierInterface as xbi,
+ xasyFile as xf,
+ xasyOptions as xo,
+ xasyStrings as xs,
+ xasyUtils as xu,
+ xasyTransform as xT
+)
 
 
 class ActionChanges:
@@ -936,7 +930,7 @@ def actionManual(self):
  webbrowser.open_new(asyManualURL)
 
  def actionAbout(self):
- Qw.QMessageBox.about(self,"xasy","This is xasy "+xasyVersion.xasyVersion+"; a graphical front end to the Asymptote vector graphics language: https://asymptote.sourceforge.io/")
+ Qw.QMessageBox.about(self,"xasy","This is xasy "+VERSION+"; a graphical front end to the Asymptote vector graphics language: https://asymptote.sourceforge.io/")
 
  def actionExport(self, pathToFile):
  asyFile = io.open(os.path.realpath(pathToFile), 'w')

GUI/labelEditor.py → GUI/xasygui/labelEditor.py

@@ -1,19 +1,16 @@
 #!/usr/bin/env python3
-
-from pyUIClass.labelTextEditor import Ui_Dialog
-import PyQt5.QtWidgets as QtWidgets
-import PyQt5.QtSvg as QtSvg
-import PyQt5.QtGui as QtGui
-import PyQt5.QtCore as QtCore
-import xasyArgs as xasyArgs
-import xasy2asy as xasy2asy
-import xasyOptions as xasyOptions
-import xasyUtils as xasyUtils
+import os
 import subprocess
 import tempfile
 import uuid
-import os
-import io
+
+import PyQt5.QtCore as QtCore
+import PyQt5.QtGui as QtGui
+import PyQt5.QtSvg as QtSvg
+import PyQt5.QtWidgets as QtWidgets
+
+from xasyqtui.labelTextEditor import Ui_Dialog
+from . import xasyArgs, xasyUtils
 
 
 class labelEditor(QtWidgets.QDialog):

GUI/xasy.py → GUI/xasygui/xasy.py

@@ -1,9 +1,14 @@
 #!/usr/bin/env python3
 
-import sys, signal, os
-import PyQt5.QtWidgets as QtWidgets
+import os
+import signal
+import sys
+
 import PyQt5.QtCore as QtCore
-from Window1 import MainWindow1
+import PyQt5.QtWidgets as QtWidgets
+
+from .Window1 import MainWindow1
+
 
 def main(args):
  os.environ["QT_LOGGING_RULES"]="*.debug=false;qt.qpa.*=false"

GUI/xasy2asy.py → GUI/xasygui/xasy2asy.py

@@ -9,32 +9,32 @@
 #
 ###########################################################################
 
-import PyQt5.QtWidgets as QtWidgets
-import PyQt5.QtGui as QtGui
-import PyQt5.QtCore as QtCore
-import PyQt5.QtSvg as QtSvg
-
-import numpy as numpy
-
-import sys
+import atexit
+import copy
+import io
 import os
-import signal
-import threading
+import queue
+import re
+import shutil
 import string
 import subprocess
+import sys
 import tempfile
-import re
-import shutil
-import copy
-import queue
-import io
-import atexit
-import DebugFlags
+import threading
+
+import PyQt5.QtCore as QtCore
+import PyQt5.QtGui as QtGui
+import PyQt5.QtSvg as QtSvg
+import numpy as numpy
+
+from . import (
+ xasyUtils as xu,
+ xasyArgs as xa,
+ xasyOptions as xo,
+ xasySvg as xs,
+ DebugFlags
+)
 
-import xasyUtils as xu
-import xasyArgs as xa
-import xasyOptions as xo
-import xasySvg as xs
 
 class AsymptoteEngine:
  """

GUI/xasyArgs.py → GUI/xasygui/xasyArgs.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import argparse
-import xasyVersion
 import PyQt5.QtCore as QtCore
+from xasyversion.version import VERSION
 # Add arguments here.
 
 
@@ -11,7 +11,7 @@ def parseArgs(args):
  help='Custom path to asy executable')
  parser.add_argument('-v', '-version', '--version',
  help='Version number', action='version',
- version='xasy v{0}'.format(xasyVersion.xasyVersion))
+ version='xasy v{0}'.format(VERSION))
  parser.add_argument('-l', '-language', '--language',
  help='language')
  parser.add_argument('-x', '-mag', '--mag',

GUI/xasyBezierInterface.py → GUI/xasygui/xasyBezierInterface.py

@@ -1,15 +1,11 @@
 #!/usr/bin/env python3
+import math
 
-
-import PyQt5.QtWidgets as QtWidgets
 import PyQt5.QtCore as QtCore
 import PyQt5.QtGui as QtGui
-import xasy2asy as xasy2asy
-import xasyUtils as xasyUtils
-import Widg_editBezier as Web
 
-import InplaceAddObj
-import math
+from . import xasy2asy, xasyUtils, InplaceAddObj, Widg_editBezier as Web
+
 
 class CurrentlySelctedType:
  none = -1

GUI/xasyFile.py → GUI/xasygui/xasyFile.py

@@ -10,9 +10,9 @@
 ############################################################################
 
 from string import *
-import xasy2asy as xasy2asy
 import io
 import re
+from . import xasy2asy
 
 
 class xasyParseError(Exception):

GUI/xasyTransform.py → GUI/xasygui/xasyTransform.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-import xasy2asy as xasy2asy
 import PyQt5.QtGui as QtGui
 import PyQt5.QtCore as QtCore
 import numpy as numpy
 import math
+from . import xasy2asy
 
 
 class xasyTransform:
@@ -21,4 +21,3 @@ def makeScaleTransform(cls, sx, sy, origin):
  origin = (origin.x(), origin.y())
  shiftMat = xasy2asy.asyTransform((0, 0, 1 - sx, 0, 0, 1 - sy)) * origin
  return xasy2asy.asyTransform((shiftMat[0], shiftMat[1], sx, 0, 0, sy))
-