Commit 6ded22f9 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

intermetiate step

parent 0bab78a7

Makefile

+2 −5
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ PROJVER=$(shell $(PYTHON) -c "from pysen.revision import __version__; print(__ve 
PROJECT=$(PROJNAME)-$(PROJVER)





.PHONY: all build build-dist build-ui build-docs install test runtest pylint clean clean-ui clean-docs distclean



all: build
@@ -24,7 +23,7 @@ build: build-ui build-docs 
build-dist: build

	@$(PYTHON) setup.py  bdist



install:

install-user: build

	pip install --user .



uninstall:
@@ -39,7 +38,6 @@ runtest: 
pylint:

	@PYTHONPATH=. pylint --rcfile=.pylint.rc pysen scripts





clean: clean-ui clean-docs

	@-$(PYTHON) setup.py clean

	@find . -name '*~'    | xargs rm -f
@@ -55,8 +53,6 @@ tarball: 
	git archive --format=tar --prefix=$(PROJECT)/ HEAD > $(PROJECT).tar

	gzip -f $(PROJECT).tar







# "SUBSYSTEMS"

build-docs:

	@$(MAKE) -C doc html
@@ -70,3 +66,4 @@ build-ui: 
clean-ui:

	@$(MAKE) -C pysen/ui clean



.PHONY: all build build-dist build-ui build-docs install-user test runtest pylint clean clean-ui clean-docs distclean

pysen/plot/qplot.py

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ def plot_diffrun_new(axis, filenames, **kwargs): 


        #print(data.keys())



plot_diffrun = plot_diffrun_old

plot_diffrun = plot_diffrun_new





def plot_transmission(ax0, ax1, filenames, **kwargs):

pysen/revision.py

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ PySEN revision module 
"""

import sys

__version__  = "0.71"

__release__  = "dev1"

__date__     = "Aug, 2022"

__release__  = "dev2"

__date__     = "Aug 2, 2022"



def version(full=False):

    "get pysen version number"

scripts/plot_diffrun.py

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ def main_old(): 
        print(e)





def main_new():

def main():

    "main entry"

    parser = argparse.ArgumentParser()

    parser.set_defaults(what=None,
@@ -123,4 +123,4 @@ def main_new(): 




if __name__ == "__main__":

    main_old()
 
    main()

setup.py

+4 −4
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ setup( 
      entry_points={

        'console_scripts': [

            'convert2hdf      = pysen.inout.convert2hdf:main',

            'nseplot      = pysen.plot.nseplot:main',

            'make_phase_table = pysen.plot.make_phase_table:main',

            'xyz_analysis     = pysen.plot.xyz_analysis:main',

            'make_phase_table = pysen.echo.make_phase_table:main',

            'nseplot          = pysen.plot.nseplot:main',

        ]

      },

      scripts       = [