Commit a5d7cd0a authored by Damien Naudet's avatar Damien Naudet
Browse files

Renamed kmap to xsocs.

parent c8ab3a95
......@@ -60,7 +60,7 @@ script:
- pip install --upgrade pip
# Install from source package
- pip install --pre --find-links dist/ --trusted-host www.edna-site.org --find-links http://www.edna-site.org/pub/wheelhouse/ kmap
- pip install --pre --find-links dist/ --trusted-host www.edna-site.org --find-links http://www.edna-site.org/pub/wheelhouse/ xsocs
# Print Python info
- python ci/info_platform.py
......
include README.rst
include MANIFEST.in
include run_tests.py
recursive-include kmap *.pyx *.pxd *.pxi
recursive-include kmap *.h *.c *.cpp
recursive-include xsocs *.pyx *.pxd *.pxi
recursive-include xsocs *.h *.c *.cpp
recursive-include doc/source *.py *.rst *.png *.ico
kmap
xsocs
====
TBD
......@@ -9,8 +9,8 @@ Installation
The latest development version can be obtained from the git repository::
git clone git://gitlab.esrf.fr:kmap/kmap.git
cd kmap
git clone git://gitlab.esrf.fr:xsocs/xsocs.git
cd xsocs
And then install::
pip install . [--user]
......@@ -50,7 +50,7 @@ Testing
License
-------
The source code of kmap is licensed under the MIT and LGPL licenses.
The source code of xsocs is licensed under the MIT and LGPL licenses.
See the `copyright file TBD`_ for details.
.. |Travis Status| image:: TBD
......
......@@ -70,7 +70,7 @@ test_script:
- "pip install matplotlib"
# Install the generated wheel package to test it
#- "pip install --pre --find-links dist/ --trusted-host www.edna-site.org --find-links http://www.edna-site.org/pub/wheelhouse/ kmap"
#- "pip install --pre --find-links dist/ --trusted-host www.edna-site.org --find-links http://www.edna-site.org/pub/wheelhouse/ xsocs"
# Print Python info
- "python ci\\info_platform.py"
......
......@@ -33,20 +33,20 @@ dependencies:
- cp dist/*.tar.gz $CIRCLE_ARTIFACTS
# Install generated wheel and its dependencies
- pip install --upgrade --pre --find-links dist/ kmap
- pip install --upgrade --pre --find-links dist/ xsocs
post:
# Clean-up
- python setup.py clean --all
# Uninstall kmap before caching
# Uninstall xsocs before caching
# Hack to avoid caching installed package
- pip uninstall --yes kmap
- pip uninstall --yes xsocs
test:
pre:
# Install generated wheel
- pip install --pre --find-links dist/ kmap
- pip install --pre --find-links dist/ xsocs
override:
# Print Python info
......
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: kmap
Source: https://github.com/kmap-project
Upstream-Name: xsocs
Source: https://github.com/xsocs-project
Files: *
Copyright: 2015-2016 European Synchrotron Radiation Facility
Data analysis unit (kmap@esrf.fr)
Data analysis unit (xsocs@esrf.fr)
License: MIT
License: MIT
......
......@@ -102,12 +102,12 @@ def upgrade_project(name, repo):
if args.upgrade:
upgrade_project("kmap", "git://gitlab.esrf.fr/kmap/kmap.git")
upgrade_project("xsocs", "git://gitlab.esrf.fr/xsocs/xsocs.git")
upgrade_project("plot3d", "git://gitlab.esrf.fr/tvincent/plot3d.git")
sys.exit()
# Add local install of xrayutilities, kmap and plot3d
# Add local install of xrayutilities, xsocs and plot3d
# Build command for xrayutilities:
# PYTHONPATH=/scisoft/xsocs/lib/python2.7/site-packages ; python setup.py --without-openmp install --prefix=/scisoft/xsocs/
......@@ -116,6 +116,6 @@ script_dir = os.path.dirname(__file__)
site.addsitedir(os.path.join(script_dir, 'lib', 'python2.7', 'site-packages'))
# Start application
from kmap.gui import xsocs_main
from xsocs.gui import xsocs_main
xsocs_main(projectH5File=args.project)
......@@ -50,7 +50,7 @@ except ImportError:
from distutils.command.build_ext import build_ext
from distutils.command.sdist import sdist
PROJECT = "kmap"
PROJECT = "xsocs"
cmdclass = {}
......@@ -430,7 +430,7 @@ setup_requires = ["numpy"]
setup_kwargs.update(
name=PROJECT,
version=get_version(),
url="http://gitlab.esrf.fr/kmap/kmap",
url="http://gitlab.esrf.fr/xsocs/xsocs",
author="data analysis unit",
author_email="silx@esrf.fr",
classifiers=classifiers,
......@@ -439,7 +439,7 @@ setup_kwargs.update(
install_requires=install_requires,
setup_requires=setup_requires,
cmdclass=cmdclass,
package_data={'kmap.resources': [
package_data={'xsocs.resources': [
# Add here all resources files
'gui/icons/*.png',
]},
......
......@@ -31,7 +31,7 @@ __license__ = "MIT"
import os
import time
from kmap.util.id01_spec import merge_scan_data
from xsocs.util.id01_spec import merge_scan_data
# output directory (some temporary files will also be written there)
output_dir = '/path/to/output/'
......
import os
from kmap.process import peak_fit
from xsocs.process import peak_fit
import numpy as np
......
from kmap.process import qspace
from xsocs.process import qspace
# ========================
# Files
......
Supports Markdown
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