Commit e65a764e authored by Ruxandra Cojocaru's avatar Ruxandra Cojocaru

Merge branch 'setup' into 'master'

Setup

See merge request cojocaru/swarp!4
parents dc4f9d9e be4d3be0
include MANIFEST.in
include LICENSE.txt
include README.rst
include README.md
include requirements.txt
include setup.py
recursive-include swarp *.py *.bat
......
......@@ -88,7 +88,7 @@ def main():
name='swarp',
version='1.0.0',
description='x-ray Speckle tracking WAveFront Reconstruction Package',
long_description=open('README.rst').read(),
long_description=open('README.md').read(),
license='MIT',
author='Ruxandra Cojocaru, Sebastien Berujon',
author_email='cojocaru@esrf.fr, sebastien.berujon@esrf.fr',
......
......@@ -77,9 +77,9 @@ from scipy.interpolate import InterpolatedUnivariateSpline
# for exporting to .mat format
import scipy.io as sio
# Non-standard python libraries
from EdfFile import EdfFile
import norm_xcorr as nx
import g2s
from .EdfFile import EdfFile
from . import norm_xcorr as nx
from . import g2s
# String for default values on optional arguments
DEFAULT = uuid.uuid4()
......
......@@ -7,7 +7,7 @@
# This file is part of the SWaRP Speckle Wavefront Reconstruction Package
# developed at the ESRF by the staff of BM05 as part of EUCALL WP7:PUUCA.
#
# This project has received funding from the European Unions Horizon 2020
# This project has received funding from the European Union's Horizon 2020
# research and innovation programme under grant agreement No 654220.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment