updates

BM32ESRF · Nov 16, 2022 · f3b7685 · f3b7685
1 parent 9722f4f
commit f3b7685
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 57 deletions.
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -20,54 +20,26 @@ build:
   number: 0
 
 requirements:
-  build:
-    - python >=3.7
-    - tqdm
-    - scikit-image
-    - fabio
-    - scikit-learn
-    - tensorflow
-    - h5py
-    - keras
-    - networkx
-    - pyqt
-    - matplotlib-base
-    - scipy
-    - numpy
-    - pip
-    - setuptools
-    - setuptools_scm
   host:
-    - python >=3.7
-    - matplotlib-base
-    - keras
-    - scipy
-    - numpy
-    - h5py
-    - tensorflow
-    - pyqt
-    - scikit-learn
-    - fabio
-    - networkx
-    - scikit-image
-    - tqdm
+    - python >=3.7,<=3.10
     - pip
     - setuptools
     - setuptools_scm
+    - numpy >=1.17
   run:
-    - python >=3.7
-    - matplotlib-base >=3.4.2
-    - keras >=2.7.0
-    - scipy >=1.7.0
-    - numpy >=1.18.5
-    - h5py >=3.1
-    - tensorflow >=2.7.0
-    - pyqt >=5.9
+    - python >=3.7,<=3.10
+    - matplotlib-base >=3.4.2,<=3.6.2
+    - scipy >=1.7.0,<=1.9.3
+    - numpy >=1.17
+    - h5py >=3.1,<=3.7.0
+    - pyqt >=5.9,<=5.12.5
     - scikit-learn >=0.24.2
-    - fabio >=0.11.0
+    - fabio >=0.11
     - networkx >=2.6.3
-    - scikit-image >=0.18.0
-    - tqdm >=4.60.0
+    - scikit-image >=0.18
+    - tqdm >=4.60
+    - keras >=2.7.0,<=2.10.0
+    - tensorflow >=2.7.0,<=2.10.0
 
 test:
   imports:

diff --git a/lauetoolsnn/end_to_end_scripts/LaueNN_pyScript_1_or_2phase.py b/lauetoolsnn/end_to_end_scripts/LaueNN_pyScript_1_or_2phase.py
@@ -952,6 +952,7 @@
                                        material_, material1_, lim_x, lim_y)
             except:
                 print("Error writting H5 file")
+                print("Make sure you have pandas and pytables")
 
             try:
                 write_prediction_stats(save_directory_, material_, material1_, files_treated,\

diff --git a/requirements.txt b/requirements.txt
@@ -11,18 +11,5 @@ scikit-image
 tqdm
 scipy
 
-#matplotlib==3.5.1
-#Keras==2.8.0
-#numpy==1.22.3
-#h5py==3.6.0
-#tensorflow==2.8.0
-#PyQt5==5.15.4
-#scikit-learn==0.24.2
-#fabio==0.13.0
-#networkx==2.6.3
-#scikit-image==0.18.0
-#tqdm==4.60.0
-#scipy==1.8.0
-
 #pip install tables, pandas
 #https://github.com/titusjan/argos
diff --git a/setup.py b/setup.py
@@ -30,7 +30,18 @@
 
     setup_requires=['setuptools_scm'],
     #setup_requires=['setuptools_scm', 'matplotlib', 'Keras', 'scipy','numpy', 'h5py', 'tensorflow', 'PyQt5', 'scikit-learn', 'fabio', 'networkx', 'scikit-image', 'tqdm'],
-    install_requires=['matplotlib>=3.4.2', 'Keras>=2.7.0', 'scipy>=1.7.0','numpy>=1.18.5', 'h5py>=3.1', 'tensorflow>=2.7.0', 'PyQt5>=5.9', 'scikit-learn>=0.24.2', 'fabio>=0.11.0', 'networkx>=2.6.3', 'scikit-image>=0.18.0','tqdm>=4.60.0'],
+    install_requires=['matplotlib>=3.4.2,<=3.6.2', 
+                      'Keras>=2.7.0,<=2.10.0', 
+                      'tensorflow>=2.7.0,<=2.10.0', 
+                      'scipy>=1.7.0,<=1.9.3',
+                      'numpy>=1.18.5', 
+                      'h5py>=3.1,<=3.7.0', 
+                      'PyQt5>=5.9,<=5.12.5', 
+                      'scikit-learn>=0.24.2',
+                      'fabio>=0.11.0', 
+                      'networkx>=2.6.3', 
+                      'scikit-image>=0.18.0',
+                      'tqdm>=4.60.0'],
 
 
     entry_points={
@@ -54,6 +65,5 @@
                     "License :: OSI Approved :: MIT License "
                 ],
 
-    python_requires='>=3.7, <=3.10',
-    # >=3.7 is required becquse of PyQt5
+    python_requires='>=3.7,<=3.10',
 )