changed dependencies. this refs #109

conda.recipe/meta.yaml

@@ -2,7 +2,7 @@
 
 package:
   name: "ibeatles"
-  version: "1.0.8"
+  version: "1.0.26"
 
 source:
   path: ..
@@ -14,14 +14,24 @@ build:
 requirements:
   build:
     - python
+    - pip
     - setuptools
 
   run:
     - python
     - setuptools
     - numpy
     - matplotlib
+    - qt=5
     - qtpy
+    - pyqt
+    - args
+    - Pillow
+    - versioneer
+    - astropy
+    - pyqtgraph
+    - scipy
+    - lmfit
 
 test:
   imports:

environment.yml

@@ -2,27 +2,31 @@ name: ibeatles
 channels:
   - conda-forge
 dependencies:
-  - cycler=0.10.0=py27_0
-  - freetype=2.5.5=0
-  - libpng=1.6.17=0
-  - matplotlib=1.5.1=np111py27_0
-  - mkl=11.3.1=0
-  - numpy=1.11.0=py27_0
-  - openssl=1.0.2g=0
-  - pip=8.1.1=py27_1
-  - pyparsing=2.1.1=py27_0
-  - pyqt=4.11.4=py27_1
-  - python=2.7.11=0
-  - python-dateutil=2.5.2=py27_0
-  - pytz=2016.3=py27_0
-  - qt=4.8.7=1
-  - readline=6.2=2
-  - setuptools=20.7.0=py27_0
-  - sip=4.16.9=py27_0
-  - six=1.10.0=py27_0
-  - sqlite=3.9.2=0
-  - tk=8.5.18=0
-  - wheel=0.29.0=py27_0
-  - zlib=1.2.8=0
+  - cycler
+  - freetype
+  - libpng
+  - matplotlib
+  - mkl
+  - numpy
+  - openssl
+  - pip
+  - pyparsing
+  - pyqt=5.9.2
+  - python=3.7
+  - python-dateutil
+  - pytz
+  - qt=5.9.7
+  - readline
+  - setuptools
+  - sip
+  - six
+  - sqlite
+  - tk
+  - wheel
+  - zlib
   - pyqtgraph=0.12.1
-  - lmfit=1.0.3
+  - lmfit
+  - qtpy
+  - versioneer
+  - astropy
+  - neutronbraggedge

environment_old.yml

@@ -0,0 +1,28 @@
+name: ibeatles
+channels:
+  - conda-forge
+dependencies:
+  - cycler=0.10.0=py27_0
+  - freetype=2.5.5=0
+  - libpng=1.6.17=0
+  - matplotlib=1.5.1=np111py27_0
+  - mkl=11.3.1=0
+  - numpy=1.11.0=py27_0
+  - openssl=1.0.2g=0
+  - pip=8.1.1=py27_1
+  - pyparsing=2.1.1=py27_0
+  - pyqt=4.11.4=py27_1
+  - python=3.7
+  - python-dateutil=2.5.2=py27_0
+  - pytz=2016.3=py27_0
+  - qt=4.8.7=1
+  - readline=6.2=2
+  - setuptools=20.7.0=py27_0
+  - sip=4.16.9=py27_0
+  - six=1.10.0=py27_0
+  - sqlite=3.9.2=0
+  - tk=8.5.18=0
+  - wheel=0.29.0=py27_0
+  - zlib=1.2.8=0
+  - pyqtgraph=0.12.1
+  - lmfit=1.0.3

iBeatles/__init__.py → ibeatles/__init__.py

@@ -1,6 +1,6 @@
 import os
 from qtpy.uic import loadUi
-from iBeatles import ui
+from ibeatles import ui
 from ._version import get_versions
 
 __version__ = get_versions()['version']

iBeatles/fitting/display.py → ibeatles/fitting/display.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from iBeatles.utilities.display import Display as UtilitiesDisplay
+from ibeatles.utilities.display import Display as UtilitiesDisplay
 
 
 class Display:

iBeatles/fitting/event_handler.py → ibeatles/fitting/event_handler.py

@@ -2,7 +2,7 @@
 import numpy as np
 
 from ..utilities.array_utilities import find_nearest_index
-from iBeatles.utilities.math_tools import is_float
+from ibeatles.utilities.math_tools import is_float
 from .selected_bin_handler import SelectedBinsHandler
 
 

iBeatles/fitting/fitting_handler.py → ibeatles/fitting/fitting_handler.py

@@ -9,7 +9,7 @@
 from .. import DataType
 from . import FittingTabSelected, KropffTabSelected
 from ..utilities.array_utilities import get_min_max_xy
-from iBeatles.fitting import selected_color, lock_color
+from ibeatles.fitting import selected_color, lock_color
 
 
 class FittingHandler:

iBeatles/fitting/fitting_launcher.py → ibeatles/fitting/fitting_launcher.py

@@ -12,17 +12,17 @@
 from .selected_bin_handler import SelectedBinsHandler
 from ..table_dictionary.table_dictionary_handler import TableDictionaryHandler
 from .filling_table_handler import FillingTableHandler
-from iBeatles.fitting.march_dollase.fitting_initialization_handler import FittingInitializationHandler
-from iBeatles.fitting.march_dollase.create_fitting_story_launcher import CreateFittingStoryLauncher
+from ibeatles.fitting.march_dollase.fitting_initialization_handler import FittingInitializationHandler
+from ibeatles.fitting.march_dollase.create_fitting_story_launcher import CreateFittingStoryLauncher
 from .initialization import Initialization
 from .event_handler import EventHandler
-from iBeatles.fitting.kropff.event_handler import EventHandler as KropffHandler
-from iBeatles.fitting.kropff.kropff_automatic_settings_launcher import KropffAutomaticSettingsLauncher
-from iBeatles.fitting.march_dollase.event_handler import EventHandler as MarchDollaseEventHandler
-from iBeatles.fitting.kropff.display import Display as KropffDisplay
-from iBeatles.fitting.display import Display as FittingDisplay
-from iBeatles.fitting.get import Get
-from iBeatles.step6.strain_mapping_launcher import StrainMappingLauncher
+from ibeatles.fitting.kropff.event_handler import EventHandler as KropffHandler
+from ibeatles.fitting.kropff.kropff_automatic_settings_launcher import KropffAutomaticSettingsLauncher
+from ibeatles.fitting.march_dollase.event_handler import EventHandler as MarchDollaseEventHandler
+from ibeatles.fitting.kropff.display import Display as KropffDisplay
+from ibeatles.fitting.display import Display as FittingDisplay
+from ibeatles.fitting.get import Get
+from ibeatles.step6.strain_mapping_launcher import StrainMappingLauncher
 
 
 class FittingLauncher(object):

iBeatles/fitting/get.py → ibeatles/fitting/get.py

@@ -2,8 +2,8 @@
 
 from . import KropffTabSelected, FittingTabSelected
 from ..utilities.table_handler import TableHandler
-from iBeatles.utilities.array_utilities import find_nearest_index
-from iBeatles.fitting.kropff.fitting_functions import kropff_high_lambda, kropff_bragg_peak_tof, kropff_low_lambda
+from ibeatles.utilities.array_utilities import find_nearest_index
+from ibeatles.fitting.kropff.fitting_functions import kropff_high_lambda, kropff_bragg_peak_tof, kropff_low_lambda
 
 
 class Get:

iBeatles/fitting/initialization.py → ibeatles/fitting/initialization.py

@@ -12,8 +12,8 @@
 from .. import DataType, interact_me_style
 from ..utilities.table_handler import TableHandler
 from .. import settings_image
-from iBeatles.fitting import KropffThresholdFinder
-from iBeatles.utilities.mplcanvas import MplCanvas
+from ibeatles.fitting import KropffThresholdFinder
+from ibeatles.utilities.mplcanvas import MplCanvas
 
 
 class Initialization:

iBeatles/fitting/kropff/display.py → ibeatles/fitting/kropff/display.py

@@ -1,8 +1,8 @@
 import pyqtgraph as pg
 import numpy as np
 
-from iBeatles.fitting.get import Get
-from iBeatles.utilities.display import Display as UtilitiesDisplay
+from ibeatles.fitting.get import Get
+from ibeatles.utilities.display import Display as UtilitiesDisplay
 
 
 class Display:

iBeatles/fitting/kropff/event_handler.py → ibeatles/fitting/kropff/event_handler.py

@@ -2,12 +2,12 @@
 import pyqtgraph as pg
 import copy
 
-from iBeatles.fitting.get import Get
-from iBeatles.fitting.kropff.kropff_bragg_peak_threshold_calculator import KropffBraggPeakThresholdCalculator
-from iBeatles import DataType, interact_me_style, normal_style
-from iBeatles.fitting.kropff.fit_regions import FitRegions
-from iBeatles.fitting.kropff.display import Display
-from iBeatles.fitting.fitting_handler import FittingHandler
+from ibeatles.fitting.get import Get
+from ibeatles.fitting.kropff.kropff_bragg_peak_threshold_calculator import KropffBraggPeakThresholdCalculator
+from ibeatles import DataType, interact_me_style, normal_style
+from ibeatles.fitting.kropff.fit_regions import FitRegions
+from ibeatles.fitting.kropff.display import Display
+from ibeatles.fitting.fitting_handler import FittingHandler
 
 
 fit_rgb = (255, 0, 0)

iBeatles/fitting/kropff/fit_regions.py → ibeatles/fitting/kropff/fit_regions.py

@@ -2,12 +2,12 @@
 from lmfit import Model, Parameter
 import copy
 
-from iBeatles.utilities.status_message_config import StatusMessageStatus, show_status_message
-import iBeatles.utilities.error as fitting_error
-from iBeatles.fitting.kropff.get import Get
-from iBeatles.fitting.kropff.fitting_functions import kropff_high_lambda, kropff_bragg_peak_tof, kropff_low_lambda
-from iBeatles.fitting import KropffTabSelected
-from iBeatles.utilities.array_utilities import find_nearest_index
+from ibeatles.utilities.status_message_config import StatusMessageStatus, show_status_message
+import ibeatles.utilities.error as fitting_error
+from ibeatles.fitting.kropff.get import Get
+from ibeatles.fitting.kropff.fitting_functions import kropff_high_lambda, kropff_bragg_peak_tof, kropff_low_lambda
+from ibeatles.fitting import KropffTabSelected
+from ibeatles.utilities.array_utilities import find_nearest_index
 
 
 class FitRegions:

iBeatles/fitting/kropff/get.py → ibeatles/fitting/kropff/get.py

@@ -1,7 +1,7 @@
 import numpy as np
 
-from iBeatles.fitting.kropff import FittingRegions
-import iBeatles.utilities.error as fitting_error
+from ibeatles.fitting.kropff import FittingRegions
+import ibeatles.utilities.error as fitting_error
 
 
 class Get:

iBeatles/fitting/kropff/kropff_automatic_settings_launcher.py → ibeatles/fitting/kropff/kropff_automatic_settings_launcher.py

@@ -1,7 +1,7 @@
 from qtpy.QtWidgets import QDialog
 
-from iBeatles import load_ui
-from iBeatles.fitting import KropffThresholdFinder
+from ibeatles import load_ui
+from ibeatles.fitting import KropffThresholdFinder
 
 
 class KropffAutomaticSettingsLauncher(QDialog):

iBeatles/fitting/kropff/kropff_automatic_threshold_algorithms.py → ibeatles/fitting/kropff/kropff_automatic_threshold_algorithms.py

@@ -5,7 +5,7 @@
 from changepy.costs import normal_var
 from qtpy import QtGui
 
-from iBeatles.fitting import KropffThresholdFinder
+from ibeatles.fitting import KropffThresholdFinder
 
 
 class MeanRangeCalculation(object):

iBeatles/fitting/kropff/kropff_bragg_peak_threshold_calculator.py → ibeatles/fitting/kropff/kropff_bragg_peak_threshold_calculator.py

@@ -1,8 +1,8 @@
 import logging
 import numpy as np
 
-from iBeatles.fitting.kropff.kropff_automatic_threshold_algorithms import Algorithms
-from iBeatles.utilities.table_handler import TableHandler
+from ibeatles.fitting.kropff.kropff_automatic_threshold_algorithms import Algorithms
+from ibeatles.utilities.table_handler import TableHandler
 
 
 class KropffBraggPeakThresholdCalculator:

iBeatles/fitting/march_dollase/advanced_selection_launcher.py → ibeatles/fitting/march_dollase/advanced_selection_launcher.py

@@ -2,10 +2,10 @@
 from qtpy import QtCore
 import numpy as np
 
-# from iBeatles.py.interfaces.ui_advancedFittingSelection import Ui_MainWindow as UiMainWindow
-from iBeatles.fitting.filling_table_handler import FillingTableHandler
-from iBeatles import load_ui
-from iBeatles.fitting.march_dollase.event_handler import EventHandler
+# from ibeatles.py.interfaces.ui_advancedFittingSelection import Ui_MainWindow as UiMainWindow
+from ibeatles.fitting.filling_table_handler import FillingTableHandler
+from ibeatles import load_ui
+from ibeatles.fitting.march_dollase.event_handler import EventHandler
 
 
 class AdvancedSelectionLauncher(object):

iBeatles/fitting/march_dollase/create_fitting_story_launcher.py → ibeatles/fitting/march_dollase/create_fitting_story_launcher.py

@@ -3,10 +3,10 @@
 from qtpy import QtGui
 import numpy as np
 
-from iBeatles.table_dictionary.table_fitting_story_dictionary_handler import TableFittingStoryDictionaryHandler
-from iBeatles.fitting.fitting_job_handler import FittingJobHandler
-from iBeatles import load_ui
-from iBeatles import up_image, down_image
+from ibeatles.table_dictionary.table_fitting_story_dictionary_handler import TableFittingStoryDictionaryHandler
+from ibeatles.fitting.fitting_job_handler import FittingJobHandler
+from ibeatles import load_ui
+from ibeatles import up_image, down_image
 
 
 class CreateFittingStoryLauncher(object):

iBeatles/fitting/march_dollase/event_handler.py → ibeatles/fitting/march_dollase/event_handler.py

@@ -2,10 +2,10 @@
 from qtpy import QtCore
 import numpy as np
 
-from iBeatles.table_dictionary.table_dictionary_handler import TableDictionaryHandler
-from iBeatles.fitting.selected_bin_handler import SelectedBinsHandler
-from iBeatles.utilities.table_handler import TableHandler
-from iBeatles.fitting.filling_table_handler import FillingTableHandler
+from ibeatles.table_dictionary.table_dictionary_handler import TableDictionaryHandler
+from ibeatles.fitting.selected_bin_handler import SelectedBinsHandler
+from ibeatles.utilities.table_handler import TableHandler
+from ibeatles.fitting.filling_table_handler import FillingTableHandler
 
 
 class EventHandler:

iBeatles/fitting/march_dollase/fitting_initialization_handler.py → ibeatles/fitting/march_dollase/fitting_initialization_handler.py

@@ -2,11 +2,11 @@
 from qtpy.QtWidgets import QApplication
 import numpy as np
 
-from iBeatles.table_dictionary.table_dictionary_handler import TableDictionaryHandler
-from iBeatles.fitting.initialization_sigma_alpha import InitializationSigmaAlpha
+from ibeatles.table_dictionary.table_dictionary_handler import TableDictionaryHandler
+from ibeatles.fitting.initialization_sigma_alpha import InitializationSigmaAlpha
 
 
-# from iBeatles.py.utilities.math_tools import calculate_inflection_point
+# from ibeatles.py.utilities.math_tools import calculate_inflection_point
 
 
 class FittingInitializationHandler(object):

iBeatles/fitting/selected_bin_handler.py → ibeatles/fitting/selected_bin_handler.py

@@ -4,7 +4,7 @@
 from ..fitting.fitting_functions import basic_fit, advanced_fit
 from .get import Get
 from . import FittingTabSelected
-from iBeatles.fitting.display import Display as FittingDisplay
+from ibeatles.fitting.display import Display as FittingDisplay
 
 
 class SelectedBinsHandler(object):

iBeatles/fitting/set_fitting_variables_launcher.py → ibeatles/fitting/set_fitting_variables_launcher.py

@@ -5,7 +5,7 @@
 from ..fitting.set_fitting_variables_handler import SetFittingVariablesHandler
 from ..fitting.filling_table_handler import FillingTableHandler
 from .. import load_ui
-from iBeatles.fitting.march_dollase.event_handler import EventHandler
+from ibeatles.fitting.march_dollase.event_handler import EventHandler
 
 
 class SetFittingVariablesLauncher(object):

iBeatles/fitting/value_table_handler.py → ibeatles/fitting/value_table_handler.py

@@ -4,7 +4,7 @@
 
 from ..table_dictionary.table_dictionary_handler import TableDictionaryHandler
 from .export_fitting_handler import ExportFittingHandler
-from iBeatles.fitting.march_dollase.advanced_selection_launcher import AdvancedSelectionLauncher
+from ibeatles.fitting.march_dollase.advanced_selection_launcher import AdvancedSelectionLauncher
 from .filling_table_handler import FillingTableHandler
 from .set_fitting_variables_launcher import SetFittingVariablesLauncher
 from ..table_dictionary.export import Export

iBeatles/iBeatles.py → ibeatles/iBeatles.py

@@ -276,7 +276,8 @@ def __init__(self, parent=None):
                             format='[%(levelname)s] - %(asctime)s - %(message)s',
                             level=logging.INFO)
         logging.info("*** Starting a new session ***")
-        logging.info(f" Version: {versioneer.get_version()}")
+        #logging.info(f" Version: {versioneer.get_versions()}")
+        logging.info(f" Version: FIXME!")
 
         self.automatic_load_of_previous_session()
 

iBeatles/interfaces/mplwidget.py → ibeatles/interfaces/mplwidget.py

@@ -22,7 +22,7 @@
                                                             '#000000'], N=256)
 matplotlib.cm.register_cmap('default', cmap=cmap)
 
-# from iBeatles.py.icons import icons_rc  # @UnusedImport
+# from ibeatles.py.icons import icons_rc  # @UnusedImport
 
 
 class NavigationToolbar(NavigationToolbar2QT):