Merge pull request #207 from Jhsmit/versioneer

Update to versioneer

Author: Jhsmit

.gitattributes

@@ -0,0 +1 @@
+pyhdx/_version.py export-subst

.github/workflows/pypi_test.yml

@@ -15,6 +15,10 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
+    - name: Set up Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: '14'
     - name: Build
       run: |
         pip install wheel

LICENSE LICENSE.txtLICENSE renamed to LICENSE.txt

@@ -1,11 +1,18 @@
-include AUTHORS.rst
-include CONTRIBUTING.rst
-include HISTORY.rst
-include LICENSE
-include README.rst
-
-recursive-include tests *
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
-
-recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
+include AUTHORS.rst
+include CONTRIBUTING.rst
+include HISTORY.rst
+include LICENSE.txt
+include README.rst
+
+recursive-include tests *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
+
+include versioneer.py
+include pyhdx/_version.py
+include pyhdx/web/*.html
+include pyhdx/web/*.ts
+include pyhdx/web/bokeh_extensions/*.ts
+graft pyhdx/web/dist
+graft pyhdx/web/static

MANIFEST.in

@@ -12,7 +12,7 @@
 from panel.widgets.base import Widget
 import param
 from pathlib import Path
-from pyhdx.panel.base import STATIC_DIR
+from pyhdx.web.base import STATIC_DIR
 
 
 TS_CODE = """

dev/bokeh_extension.py

@@ -6,10 +6,10 @@
 from pyhdx.fileIO import read_dynamx, txt_to_np
 from pyhdx import PeptideMasterTable
 import pickle
-from pyhdx.panel.apps import _color_matrix_app
-from pyhdx.panel.utils import reload_previous
-from pyhdx.panel.base import DEFAULT_COLORS, STATIC_DIR
-from pyhdx.panel.sources import DataSource
+from pyhdx.web.apps import _color_matrix_app
+from pyhdx.web.utils import reload_previous
+from pyhdx.web.base import DEFAULT_COLORS, STATIC_DIR
+from pyhdx.web.sources import DataSource
 import panel as pn
 import numpy as np
 from pathlib import Path

dev/gui/dev_gui_matrix.py

@@ -3,13 +3,13 @@
 
 """
 
-from pyhdx.fileIO import read_dynamx, txt_to_np, csv_to_dataframe
+from pyhdx.fileIO import read_dynamx, csv_to_dataframe
 from pyhdx import PeptideMasterTable
 import pickle
-from pyhdx.panel.apps import main_app
-from pyhdx.panel.utils import reload_previous
-from pyhdx.panel.base import DEFAULT_COLORS, STATIC_DIR
-from pyhdx.panel.sources import DataSource
+from pyhdx.web.apps import main_app
+from pyhdx.web.utils import reload_previous
+from pyhdx.web.base import DEFAULT_COLORS, STATIC_DIR
+from pyhdx.web.sources import DataSource
 from pyhdx.batch_processing import load_from_yaml
 from pyhdx.fileIO import csv_to_protein
 import panel as pn
@@ -124,7 +124,7 @@ def init_dashboard():
 
 
 #if __name__ == '__main__':
-pn.state.onload(reload_dashboard)
+#pn.state.onload(reload_dashboard)
 #pn.state.onload(init_dashboard)
 
 pn.serve(ctrl.template, show=True

dev/gui/dev_gui_secB.py

@@ -6,10 +6,10 @@
 from pyhdx import PeptideMasterTable
 import pickle
 import os
-from pyhdx.panel.apps import _diff_app
-from pyhdx.panel.utils import reload_previous
-from pyhdx.panel.base import DEFAULT_COLORS
-from pyhdx.panel.sources import DataSource
+from pyhdx.web.apps import _diff_app
+from pyhdx.web.utils import reload_previous
+from pyhdx.web.base import DEFAULT_COLORS
+from pyhdx.web.sources import DataSource
 import panel as pn
 import numpy as np
 from pathlib import Path

dev/gui/dev_gui_secB_diff.py

@@ -6,10 +6,10 @@
 from pyhdx import PeptideMasterTable
 import pickle
 import os
-from pyhdx.panel.apps import _single_app
-from pyhdx.panel.utils import reload_previous
-from pyhdx.panel.base import DEFAULT_COLORS, STATIC_DIR
-from pyhdx.panel.sources import DataSource
+from pyhdx.web.apps import _single_app
+from pyhdx.web.utils import reload_previous
+from pyhdx.web.base import DEFAULT_COLORS, STATIC_DIR
+from pyhdx.web.sources import DataSource
 import panel as pn
 import numpy as np
 from pathlib import Path

dev/gui/dev_gui_secB_single.py

@@ -1,9 +1,9 @@
-from pyhdx.panel.utils import reload_previous
+from pyhdx.web.utils import reload_previous
 from pyhdx.support import np_from_txt
 import os
 import numpy as np
-from pyhdx.panel.base import DEFAULT_COLORS
-from pyhdx.panel.main import tmpl, ctrl
+from pyhdx.web.base import DEFAULT_COLORS
+from pyhdx.web.main import tmpl, ctrl
 import panel as pn
 import pickle