diff --git a/COPYRIGHT b/COPYRIGHT
index 1141c539aaf0c60f35d60258e826a0875ae0389c..2a9a10ebd9dbc087d60391013cc9095dbb219674 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,3 @@
-"""
ARIA -- Ambiguous Restraints for Iterative Assignment
A software for automated NOE assignment
@@ -19,9 +18,3 @@ a warranty of non-infringement.
Distribution of substantively modified versions of this module is
prohibited without the explicit permission of the copyright holders.
-
-$Author: bardiaux $
-$Revision: 1.1.1.1 $
-$Date: 2010/03/23 15:27:16 $
-"""
-
diff --git a/aria.shub b/aria.shub
index 114821c5068dcfadddfa0270539b1f352e4097e1..da23815b9e464b3e46d3bf386447dede0966ec21 100644
--- a/aria.shub
+++ b/aria.shub
@@ -20,7 +20,7 @@ FROM: centos:centos7
# installing ariaec #
#################################
cd /
- ARIAEC_VERS="0.2.3"
+ ARIAEC_VERS="0.1.0"
wget -O ariaec-${ARIAEC_VERS}.tar.gz https://gitlab.pasteur.fr/bis-aria/ariaec/repository/master/archive.tar.gz
mkdir ariaec-${ARIAEC_VERS} && tar xzf ariaec-${ARIAEC_VERS}.tar.gz -C ariaec-${ARIAEC_VERS} --strip-components 1
cd ariaec-${ARIAEC_VERS}
diff --git a/docs/contents.rst b/docs/contents.rst
index 706adb8980527bff2a916488c0d4fb50e2d395d0..6c721e292356315161a061a5d6af3c906dd7f5cd 100644
--- a/docs/contents.rst
+++ b/docs/contents.rst
@@ -19,3 +19,5 @@
:caption: Examples
examples/index
+ examples/ec
+ examples/ecnmr
\ No newline at end of file
diff --git a/docs/examples/ec.rst b/docs/examples/ec.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/docs/examples/ecnmr.rst b/docs/examples/ecnmr.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/docs/installation.rst b/docs/installation.rst
index 4da6c814efb3776f1a374c4086107a0495e9878b..33b984fba848f2a566f957edf0a6618bc51a6776 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -48,7 +48,7 @@ the transition to Python 3 is planned in the near future.
.. code-block:: shell
cd ariaec-master
- mkdir build_aria && cp -r aria setup.py PKG-INFO build_aria/
+ mkdir build_aria && cp -r aria setup.py PKG-INFO MANIFEST.in build_aria/
cd build_aria
pip install --user .
@@ -63,7 +63,7 @@ allowing cross platform and legacy OS support.
sudo singularity build aria.simg aria.shub
-The CLI:abbr:`Command Line Interface` described in :doc:`usage` section will
+The :abbr:`Command Line Interface (CLI)` described in :doc:`usage` section will
then be accessible by calling the generated singularity image.
.. code-block:: shell
diff --git a/setup.py b/setup.py
index 70e653f46f27d69d487df4b14cfb0ee7c1e9e092..6afae27d23fa488b6b768e0e1513aabf6ad85778 100644
--- a/setup.py
+++ b/setup.py
@@ -118,16 +118,13 @@ def get_version(full=True):
print('Unable to get git index status')
sys.exit(1)
-
-
if dirty != '' and full:
version += '.dev1'
-
else:
# Extract the version from the PKG-INFO file.
with open(join(d, 'PKG-INFO')) as foo:
- version = VERSION_REC.search(foo.read()).group(1)
+ version = VERSION_REC.search(foo.read()).group(2)
return version
@@ -287,8 +284,8 @@ def setup_package():
'examples': ['*'],
'examples-dev': ['*']},
- # Using MANIFEST file, we do not need package_data which doesn't work
- # for all kind of building process ...
+ # Using MANIFEST file, it seems we do not need package_data which
+ # doesn't work for all kind of building process ...
# package_data={
# # If any package contains these files, include them
# '': [
@@ -299,12 +296,12 @@ def setup_package():
# '*.link', '*.psf', '*.sol', '*.pro', '*.pep'],
# # And include files found in the 'conbox' package, too:
# 'aria.conbox': ['conf/*',
- # 'templates/*',
- # 'data/pdbdists/*'
- # 'data/cullpdb/160427/*',
- # 'data/cullpdb/170315/*'
- # 'data/*',
- # ],
+ # 'templates/*',
+ # 'data/pdbdists/*'
+ # 'data/cullpdb/160427/*',
+ # 'data/cullpdb/170315/*'
+ # 'data/*',
+ # ],
# },
# If we want to include non data files (documentation, examples, ..)