Merge pull request #27 from Morisset/v1.17

V1.17
Morisset · Apr 13, 2023 · f353588 · f353588
2 parents 7456876 + bd3fff2
commit f353588
Show file tree

Hide file tree

Showing 34 changed files with 40,488 additions and 1,221 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on:
     branches: 
       - master
       - main
-      - v1.16
+      - devel
 jobs:
   deploy:
     runs-on: ubuntu-latest

diff --git a/docs/Notebooks/Answer_to_UetaOtsuka_2022.ipynb b/docs/Notebooks/Answer_to_UetaOtsuka_2022.ipynb
diff --git a/doxygen_config_user.txt b/doxygen_config_user.txt
diff --git a/make_documentation.py b/make_documentation.py
diff --git a/pyneb/__init__.py b/pyneb/__init__.py
@@ -13,21 +13,13 @@
 log_ = config.log_
 log_.message('Starting PyNeb version %s' % __version__, calling='PyNeb')
 
-
 if sys.version_info[0:2] < (2, 6):
     log_.warn('Python version >= 2.6 needed, seems you have {0}'.format(sys.version_info), calling='PyNeb')
 
-try:
-    from numpy.version import version as numpy_version    
-    if [int(n) for n in (numpy_version.split('.')[:3])] < [1, 5, 1] :
-        log_.warn('Numpy version >= 1.5.1 needed, seems you have {0}'.format(numpy_version), calling='PyNeb')
-except:
-    log_.warn('I do not understand what is your version of numpy: {0}, report this to PyNeb group'.format(numpy_version), calling='PyNeb')
-
 from .utils.manage_atomic_data import _ManageAtomicData
 atomicData = _ManageAtomicData()
 
-atomicData.defaultDict = 'PYNEB_21_01'
+atomicData.defaultDict = 'PYNEB_23_01'
 atomicData.resetDataFileDict()
 
 from .core.pynebcore import Atom, RecAtom, getAtomDict, getRecEmissivity, EmissionLine, Observation, \

diff --git a/pyneb/atomic_data/fe_ii_atom_B15.dat → ...atomic_data/deprecated/fe_ii_atom_B15.dat b/pyneb/atomic_data/fe_ii_atom_B15.dat → ...atomic_data/deprecated/fe_ii_atom_B15.dat
diff --git a/pyneb/atomic_data/fe_ii_atom_SRKFB19.dat → ...ic_data/deprecated/fe_ii_atom_SRKFB19.dat b/pyneb/atomic_data/fe_ii_atom_SRKFB19.dat → ...ic_data/deprecated/fe_ii_atom_SRKFB19.dat
diff --git a/pyneb/atomic_data/fe_ii_atom_VVKFHF99.dat → ...c_data/deprecated/fe_ii_atom_VVKFHF99.dat b/pyneb/atomic_data/fe_ii_atom_VVKFHF99.dat → ...c_data/deprecated/fe_ii_atom_VVKFHF99.dat
diff --git a/pyneb/atomic_data/fe_ii_coll_B15.dat → ...atomic_data/deprecated/fe_ii_coll_B15.dat b/pyneb/atomic_data/fe_ii_coll_B15.dat → ...atomic_data/deprecated/fe_ii_coll_B15.dat
diff --git a/pyneb/atomic_data/fe_ii_coll_B15_old.dat → ...ic_data/deprecated/fe_ii_coll_B15_old.dat b/pyneb/atomic_data/fe_ii_coll_B15_old.dat → ...ic_data/deprecated/fe_ii_coll_B15_old.dat
diff --git a/pyneb/atomic_data/fe_ii_coll_VVKFHF99.dat → ...c_data/deprecated/fe_ii_coll_VVKFHF99.dat b/pyneb/atomic_data/fe_ii_coll_VVKFHF99.dat → ...c_data/deprecated/fe_ii_coll_VVKFHF99.dat
diff --git a/pyneb/atomic_data/fe_iii_coll_BB14.dat → ...omic_data/deprecated/fe_iii_coll_BB14.dat b/pyneb/atomic_data/fe_iii_coll_BB14.dat → ...omic_data/deprecated/fe_iii_coll_BB14.dat
diff --git a/pyneb/atomic_data/fe_iii_coll_BBQ10.dat → ...mic_data/deprecated/fe_iii_coll_BBQ10.dat b/pyneb/atomic_data/fe_iii_coll_BBQ10.dat → ...mic_data/deprecated/fe_iii_coll_BBQ10.dat