Merge 8a2516d into 0e2a2bb

scikit-hep · Apr 3, 2019 · fa4749f · fa4749f
2 parents 0e2a2bb + 8a2516d
commit fa4749f
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 69 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,11 +6,6 @@ environment:
   global:
     WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
   matrix:
-    - TOXENV: check
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '32'
     - TOXENV: 'py27,report'
       TOXPYTHON: C:\Python27\python.exe
       PYTHON_HOME: C:\Python27

diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,6 @@ env:
   global:
   - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
   - SEGFAULT_SIGNALS=all
-  matrix:
-  - TOXENV=check
 matrix:
   include:
   - python: '2.7'

diff --git a/ci/bootstrap.py b/ci/bootstrap.py
@@ -48,7 +48,7 @@
         # WARNING: 'tox' must be installed globally or in the project's virtualenv
         for line in subprocess.check_output(['tox', '--listenvs'], universal_newlines=True).splitlines()
     ]
-    tox_environments = [line for line in tox_environments if line not in ['clean', 'report', 'docs', 'check']]
+    tox_environments = [line for line in tox_environments if line not in ['clean', 'report', 'docs']]
 
     for name in os.listdir(join("ci", "templates")):
         with open(join(base_path, name), "w") as fh:

diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml
@@ -6,7 +6,6 @@ env:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
     - SEGFAULT_SIGNALS=all
   matrix:
-    - TOXENV=check
     - TOXENV=docs
 matrix:
   include:

diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml
@@ -6,11 +6,6 @@ environment:
   global:
     WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
   matrix:
-    - TOXENV: check
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '32'
 {% for env in tox_environments %}{{ '' }}{% if env.startswith(('py2', 'py3')) %}
     - TOXENV: '{{ env }},report'
       TOXPYTHON: C:\Python{{ env[2:4] }}\python.exe

diff --git a/decaylanguage/data/MintDalitzSpecialParticles.csv b/decaylanguage/data/MintDalitzSpecialParticles.csv
@@ -1,37 +1,37 @@
-ID,Mass,MassUpper,MassLower,Width,WidthUpper,WidthLower,I,G,P,C,Anti,Rank,Status,Name,Quarks,Latex
-9981,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,NonResS,??,0^{+}
-9983,9990,10,10,9900000000,30,30,1/2,1,1,5,1,0,0,NonResA,??,1^{+}
--9983,9990,10,10,9900000000,30,30,1/2,1,1,5,1,0,0,NonResA,??,1^{-}
-9985,9990,10,10,9900000000,30,30,0,1,1,1,0,0,2,NonResT,??,2^{+}
-9986,9990,10,10,9900000000,30,30,0,1,-1,1,0,0,2,NonResPT,??,2^{-}
-9991,9990,10,10,9900000000,30,30,0,1,-1,1,0,0,0,NonResP,??,0^{-}
-9993,9990,10,10,9900000000,30,30,1/2,1,-1,5,1,0,0,NonResV,??,1^{-}
--9993,9990,10,10,9900000000,30,30,1/2,1,-1,5,1,0,0,NonResV,??,1^{+}
-998100,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,PiPi0,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{0}
-998101,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,PiPi1,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{1}
-998102,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,PiPi2,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{2}
-998103,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,PiPi3,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{3}
-998104,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,PiPi4,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{4}
-998105,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,PiPi5,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{5}
-998106,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,PiPi6,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{6}
-998110,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KPi0,??,\left[K^{-}\pi^{+}\right]^{L=0}_{0}
-998111,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KPi1,??,\left[K^{-}\pi^{+}\right]^{L=0}_{1}
-998112,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KPi2,??,\left[K^{-}\pi^{+}\right]^{L=0}_{2}
-998113,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KPi3,??,\left[K^{-}\pi^{+}\right]^{L=0}_{3}
-998114,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KPi4,??,\left[K^{-}\pi^{+}\right]^{L=0}_{4}
-998115,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KPi5,??,\left[K^{-}\pi^{+}\right]^{L=0}_{5}
-998116,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KPi6,??,\left[K^{-}\pi^{+}\right]^{L=0}_{6}
-998120,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KK0,x(uU+dD)+y(sS),
-998121,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KK1,x(uU+dD)+y(sS),
-998122,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KK2,x(uU+dD)+y(sS),
-998123,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KK3,x(uU+dD)+y(sS),
-998124,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KK4,x(uU+dD)+y(sS),
-998125,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KK5,x(uU+dD)+y(sS),
-998126,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,KK6,x(uU+dD)+y(sS),
-998130,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,rhoOmega0,??,
-998131,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,rhoOmega1,??,
-998132,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,rhoOmega2,??,
-998133,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,rhoOmega3,??,
-998134,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,rhoOmega4,??,
-998135,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,rhoOmega5,??,
-998136,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,rhoOmega6,??,
+ID,Mass,MassUpper,MassLower,Width,WidthUpper,WidthLower,I,G,P,C,Anti,Charge,Rank,Status,Name,Quarks,Latex
+9981,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,NonResS,??,0^{+}
+9983,9990,10,10,9900000000,30,30,1/2,1,1,5,1,0,0,0,NonResA,??,1^{+}
+-9983,9990,10,10,9900000000,30,30,1/2,1,1,5,1,0,0,0,NonResA,??,1^{-}
+9985,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,2,NonResT,??,2^{+}
+9986,9990,10,10,9900000000,30,30,0,1,-1,1,0,0,0,2,NonResPT,??,2^{-}
+9991,9990,10,10,9900000000,30,30,0,1,-1,1,0,0,0,0,NonResP,??,0^{-}
+9993,9990,10,10,9900000000,30,30,1/2,1,-1,5,1,0,0,0,NonResV,??,1^{-}
+-9993,9990,10,10,9900000000,30,30,1/2,1,-1,5,1,0,0,0,NonResV,??,1^{+}
+998100,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,PiPi0,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{0}
+998101,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,PiPi1,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{1}
+998102,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,PiPi2,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{2}
+998103,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,PiPi3,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{3}
+998104,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,PiPi4,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{4}
+998105,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,PiPi5,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{5}
+998106,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,PiPi6,x(uU+dD)+y(sS),\left[\pi^{+}\pi^{-}\right]^{L=0}_{6}
+998110,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KPi0,??,\left[K^{-}\pi^{+}\right]^{L=0}_{0}
+998111,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KPi1,??,\left[K^{-}\pi^{+}\right]^{L=0}_{1}
+998112,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KPi2,??,\left[K^{-}\pi^{+}\right]^{L=0}_{2}
+998113,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KPi3,??,\left[K^{-}\pi^{+}\right]^{L=0}_{3}
+998114,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KPi4,??,\left[K^{-}\pi^{+}\right]^{L=0}_{4}
+998115,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KPi5,??,\left[K^{-}\pi^{+}\right]^{L=0}_{5}
+998116,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KPi6,??,\left[K^{-}\pi^{+}\right]^{L=0}_{6}
+998120,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KK0,x(uU+dD)+y(sS),
+998121,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KK1,x(uU+dD)+y(sS),
+998122,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KK2,x(uU+dD)+y(sS),
+998123,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KK3,x(uU+dD)+y(sS),
+998124,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KK4,x(uU+dD)+y(sS),
+998125,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KK5,x(uU+dD)+y(sS),
+998126,9990,10,10,9900000000,30,30,0,1,1,1,0,0,0,0,KK6,x(uU+dD)+y(sS),
+998130,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,0,rhoOmega0,??,
+998131,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,0,rhoOmega1,??,
+998132,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,0,rhoOmega2,??,
+998133,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,0,rhoOmega3,??,
+998134,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,0,rhoOmega4,??,
+998135,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,0,rhoOmega5,??,
+998136,9990,10,10,9900000000,30,30,0,1,-1,-1,0,0,0,0,rhoOmega6,??,
diff --git a/decaylanguage/data/README.rst b/decaylanguage/data/README.rst
@@ -0,0 +1,57 @@
+DecayLanguage Data folder contents
+==================================
+
+You can ``import decaylanguage.data``, then use ``decaylanguage.data.open_text(decaylanguage.data, <A_FILE>)``
+to access data reliably regardless of how you have installed or are running the package (even from a zip file!).
+
+
+``DECAY_LHCB.DEC``
+-------------------
+
+Copy of the LHCb experiment master decay file for EvtGen, which describes
+all generic particle decays.
+
+
+``test_X.dec``
+--------------
+
+Decay files used for testing purposes.
+
+
+``decfile.lark``
+----------------
+Lark parser grammar definition file for parsing .dec decay files.
+
+
+``MintDalitzSpecialParticles.fwf``
+----------------------------------
+
+An extended PDG data file, prepared by this package's maintainers,
+for the definitions of special particles used by the Mint program.
+It is similar to the extended PDG data file ``mass_width_2008.fwf``, see
+https://github.com/scikit-hep/particle/blob/master/particle/data/README.rst.
+
+
+``MintDalitzSpecialParticlesLatex.csv``
+---------------------------------------
+
+A list of PDG IDs and LaTeX names for the special Mint program particles
+defined in the file above.
+
+
+``MintDalitzSpecialParticles.csv``
+----------------------------------
+
+The combined data file of special particles used by the Mint program,
+in a format that is easy for the ``Particle`` class
+to read and easy for physicists to extend or edit.
+
+To regenerate the file from the fixed width file
+``MintDalitzSpecialParticles.fwf`` run
+
+.. code-block:: bash
+
+    $ python -m particle.particle.convert extended \
+        decaylanguage/data/MintDalitzSpecialParticles.fwf \
+        decaylanguage/data/MintDalitzSpecialParticlesLatex.csv \
+        decaylanguage/data/MintDalitzSpecialParticles.csv
diff --git a/tests/test_convert.py b/tests/test_convert.py
@@ -5,9 +5,13 @@
 except ImportError:
     from pathlib import Path
 
+import pytest
+
+
 DIR = Path(__file__).parent.resolve()
 
 
+@pytest.mark.skip
 def test_full_convert():
     text = ampgen2goofit(DIR / '../models/DtoKpipipi_v2.txt', ret_output=True)
     with (DIR / 'output/DtoKpipipi_v2.cu').open() as f:

diff --git a/tox.ini b/tox.ini
@@ -3,17 +3,17 @@
 [tox]
 envlist =
     clean,
-    check,
     {py27,py35,py36},
     report,
+ignore_basepython_conflict=true
 
 [testenv]
 basepython =
     {py27,spell}: {env:TOXPYTHON:python2.7}
     py35: {env:TOXPYTHON:python3.5}
     py36: {env:TOXPYTHON:python3.6}
     py37: {env:TOXPYTHON:python3.7}
-    {bootstrap,clean,check,report,coveralls,codecov}: {env:TOXPYTHON:python3}
+    {bootstrap,clean,report,coveralls,codecov}: {env:TOXPYTHON:python3}
 setenv =
     PYTHONPATH={toxinidir}/tests
     PYTHONUNBUFFERED=yes
@@ -49,21 +49,6 @@ deps =
     pyenchant
 
 
-[testenv:check]
-deps =
-    docutils
-    check-manifest
-    flake8
-    readme-renderer
-    pygments
-    isort
-skip_install = true
-commands =
-    python setup.py check --strict --metadata
-    check-manifest {toxinidir}
-    flake8 decaylanguage tests setup.py
-    isort --verbose --check-only --diff --recursive decaylanguage tests setup.py
-
 [testenv:coveralls]
 deps =
     coveralls
@@ -91,4 +76,3 @@ commands =
 commands = coverage erase
 skip_install = true
 deps = coverage
-