76 Commits

Author SHA1 Message Date
coissac bc4d7dc190 Actualiser README.md 2025-09-14 07:46:53 +00:00
Eric Coissac 8c995a47a0 add flex 2025-06-22 15:53:18 +02:00
coissac 02232d6453 Actualiser Dockerfile 2025-06-16 06:16:12 +00:00
coissac 9a9a968116 Actualiser Dockerfile 2025-06-14 05:14:06 +00:00
coissac feca46cbfd Actualiser Dockerfile 2025-06-14 05:12:06 +00:00
coissac 5ea47205c5 Actualiser Dockerfile 2025-06-14 05:11:12 +00:00
coissac bca9928ade Actualiser Dockerfile 2025-06-14 05:10:22 +00:00
coissac 8cafb794b0 Actualiser Dockerfile 2025-06-14 04:50:38 +00:00
coissac cb13a8d228 Actualiser Dockerfile 2025-06-14 04:27:54 +00:00
coissac 83beecb6ec Actualiser Dockerfile 2025-06-13 21:41:15 +00:00
coissac 73030ff54f Actualiser Dockerfile 2025-06-13 18:08:19 +00:00
coissac 51ff099cca Actualiser Dockerfile 2025-06-13 14:13:43 +00:00
Eric Coissac 171920398c Update pour la dockerization 2025-06-12 17:29:50 +02:00
Celine Mercier edb0106cc0 obiaddtaxids: UNITE databases not restrained to Fungi anymore, and
better check of format
2020-04-05 17:14:04 +02:00
coissac c198e7d8bf Patch obitools for not importing too recent packages 2019-04-01 14:32:05 +02:00
coissac a2db4ce5ae ignore the new virtualenv for version 1.12.13 2019-04-01 14:12:10 +02:00
coissac 0e5ae4dd68 Switch to version 1.12.13 2019-04-01 14:06:07 +02:00
coissac 0d4bb5bbd6 cleaning 2 2019-04-01 14:04:17 +02:00
coissac ee53992acc Merge branch 'master' of git.metabarcoding.org:obitools/obitools
# Conflicts:
#	requirements.txt
2019-04-01 14:00:17 +02:00
coissac 45736d1771 Version switch 2019-04-01 13:59:09 +02:00
coissac de2673174f cleaning 1 2019-04-01 13:58:16 +02:00
Celine Mercier 1c318bd34d Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools.git 2019-03-26 11:36:54 +01:00
Celine Mercier e99684a47d Fixed --skip-on-error option for embl and genbank files (did not work
because python generators can never resume after raising any exception)
2019-03-26 11:36:11 +01:00
Celine Mercier f8dcd2f401 Fixed requirements.txt triggering errors with the 2 conditions for
ipython
2019-03-15 16:34:23 +01:00
Celine Mercier a43601cffd obitaxonomy: fixed a bug when trying to add a new species by name 2018-11-01 18:07:56 +01:00
coissac 71cc64977b Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools.git 2018-09-19 15:52:38 +02:00
Celine Mercier 0cd2814fa7 Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools.git 2018-09-19 15:39:47 +02:00
Celine Mercier 97268211ff Sphinx: replaced the deprecated 'sphinx.ext.pngmath' extension with
'sphinx.ext.imgmath' (would stop OBITools installation)
2018-09-19 15:36:51 +02:00
coissac 9962c452d8 Switch to version 1.2.11 2017-04-30 19:13:43 +02:00
coissac abf8fde9f5 Switch to version 1.2.11 2017-04-30 18:57:28 +02:00
coissac 1311cf3c63 Limit Ipython version to stay compatible with python 2.7 2017-04-27 13:49:14 +02:00
coissac 59e2665de9 close #32 2017-04-20 18:46:03 +02:00
coissac 05cc5b06c7 Switch to version 1.2.10 2017-02-01 12:01:24 +01:00
Celine Mercier 54c68bab99 Fixed a bug when parsing embl files: accession ids end with ';' in recent embl formats. The ';' was kept by the old embl parser, resulting in many possible bugs. 2017-01-23 16:56:38 +01:00
coissac 5dc1f4d325 Switch to version 1.2.9 and ask for Cython >= 2.4.0 2016-08-03 09:21:05 +02:00
coissac 8bede453ae Patch a memory bug in the progress bar printing leading to a bus error
with some C compiler and the new version of Cython (0.2.4)
2016-08-03 09:07:49 +02:00
coissac 8cbac7a75e Remove an extra log added for debuging at the beginning of the output 2016-08-03 07:59:58 +02:00
coissac 1b31d9091a swithc to version 1.2.8 2016-07-28 08:06:34 +02:00
coissac eaf50be2ca Switch to cython 0.24 2016-07-28 08:05:14 +02:00
coissac b24f993780 Remove some false error warning 2016-07-28 08:03:23 +02:00
coissac e0bf25d72c replace _BYTES call by the new .data.as_uchars to reflect the new API 2016-07-28 07:54:59 +02:00
coissac a4a854a2a8 Merge branch 'master' of git.metabarcoding.org:obitools/obitools
Conflicts:
	src/obitools/align/_lcs.ext.4.c

the symbolic link is correctly restored
2016-07-06 15:23:47 +02:00
coissac a186bf439c Small changes on distutils.ext 2016-07-06 15:17:15 +02:00
Aurélie Bonin a6daa709e9 Merge branch 'windows_version' into 'master'
Windows version

This branch allows for compiling OBITools on windows in the cygwin environment.

It asks for installing the following cygwin packages :

      - binutils
      - gcc-core
      - python 2.7

See merge request !1
2016-07-06 15:02:35 +02:00
abonin 22f98eaa4b switch to the new version 1.2.7 2016-07-06 14:50:56 +02:00
abonin 38504ab03a Final switch to the new cython interface on array.array 2016-07-06 14:46:31 +02:00
abonin 1b8a867fbf switch to the new cython interface to array.array 2016-07-06 14:29:43 +02:00
abonin 9a9bd6c60f switch to the new cython interface to array.array 2016-07-06 14:23:58 +02:00
abonin 6002fbaa98 Remove the reference to arrayarray.h 2016-07-06 14:12:56 +02:00
Aurélie Bonin e869e16d9f Adaptation for running with cygwin on windows platform 2016-07-06 11:55:32 +02:00
Aurélie Bonin 3a5ad68013 A very small fastq test file 2016-07-06 11:52:55 +02:00
coissac b8dc49ef84 Rename members of the DNA profil strucuture to potentiel avoid a compile
bug on windows cygwin
2016-06-28 15:13:30 +02:00
coissac 140f26977a Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools.git 2016-06-28 15:10:39 +02:00
coissac d96cf37147 Remove a debug trace in the installer 2016-06-28 15:10:12 +02:00
Celine Mercier 20f1c1d337 Fixed a potential bug with the parsing of taxonomic paths when using
obitaxonomy after obiaddtaxids on a general UNITE database
2016-06-16 16:40:27 +02:00
coissac f32ca9e9fa Patch the obitool url on metabarcoding.org 2016-05-27 14:37:58 +02:00
coissac a06e79102d Switch to version 1.2.6 2016-05-27 12:56:14 +02:00
coissac 0e2c486178 Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools.git 2016-05-27 12:52:04 +02:00
Celine Mercier 950bae882b Numbering version 1.2.5 2016-05-27 11:20:27 +02:00
Celine Mercier 683f3b5bbc Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools.git 2016-05-26 16:01:03 +02:00
Celine Mercier 5490144788 Fixed a bug in obitaxonomy sometimes triggering an error when adding a
new taxon from a file. Also now checks if taxon already in taxonomy.
2016-05-26 15:58:48 +02:00
coissac 42a3f98495 for cython to version 0.23.5 the latest 0.23 version 2016-04-07 12:19:42 +02:00
coissac c395d76231 patch a bug in the sequence counting of obiselect 2016-04-06 14:46:08 +02:00
coissac b2d2346eb7 Set the Cython required version to 0.23 because of a bug in the 0.24
version
2016-04-06 14:44:17 +02:00
coissac ffb33f61a9 Switch to version 1.2.3 2016-04-04 18:49:10 +02:00
Celine Mercier adbeac9684 Fixed major bug with -f UNITE_FULL option of obiaddtaxids 2016-04-04 16:36:05 +02:00
Celine Mercier 4aac47e639 Merge branch 'master' of git.metabarcoding.org:obitools/obitools 2016-03-30 16:35:49 +02:00
Celine Mercier 2028c69b3f Fixed typo in obiaddtaxids documentation 2016-03-17 15:05:18 +01:00
coissac 2649cd268c Switch to version 1.2.2 2016-01-12 20:57:47 +01:00
coissac 46b446f0c8 Add capacity to filter on merged sequences 2016-01-12 20:53:56 +01:00
Celine Mercier 6208cbee02 Fixes #20 and several other bugs related to that function 2016-01-08 11:40:39 +01:00
coissac 1d4c3f99b2 Patch a bug related to the -E et -M options 2015-10-27 20:16:07 +01:00
coissac ba30e74dc9 Switch the version number to 1.2.1 2015-10-27 18:59:51 +01:00
coissac 0e8b97ca40 Modify the action of the -M option to fit the documentation 2015-10-27 18:58:32 +01:00
coissac a95ae5126b Change the ecotag doc according to the new -M option 2015-10-27 18:56:49 +01:00
coissac 0e2f859839 Patch bug in the -E option of ecotag and add the -M option to limit the
action of the -E option
2015-10-27 18:48:03 +01:00
240 changed files with 182937 additions and 1586 deletions
+24
View File
@@ -0,0 +1,24 @@
/OBITools-1.1.19/
/OBITools-1.1.20/
/OBITools-1.1.21/
/OBITools-1.1.22/
/OBITools-1.2.0/
/obitools.test/
/build/
/dist/
/OBITools-1.2.2/
/OBITools-1.2.3/
/OBITools-1.2.4/
/OBITools-1.2.5/
/OBITools-1.2.6/
/OBITools-1.2.7/
/OBITools-1.2.8/
/OBITools-1.2.9/
/OBITools-1.2.10/
/.DS_Store
/OBITools-1.2.11/
/OBITools-1.2.12/
/obitools.test.old/
/coucou
/toto.fasta
/OBITools-1.2.13/
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/obitools/src</path>
<path>/OBITools-1.1/src</path>
<path>/${PROJECT_DIR_NAME}/distutils.ext</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+102
View File
@@ -0,0 +1,102 @@
FROM python:2.7.17-alpine AS builder
RUN apk add --no-cache \
bash flex build-base curl openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev xz-dev tk-dev libffi-dev make ncurses-dev git
RUN pip install Cython==0.29
RUN mkdir -p /app
WORKDIR /app
COPY src .
RUN gcc -o littlebigman littlebigman.c
RUN python setup.py build_ext --inplace
RUN python setup.py install
RUN ./install.sh
WORKDIR /app
RUN git clone https://forge.metabarcoding.org/obitools/ecopcr.git
WORKDIR /app/ecopcr/src
RUN make clean && make \
&& cp ecoPCR ecofind ecogrep /usr/local/bin
WORKDIR /app
RUN git clone https://forge.metabarcoding.org/obitools/ecoprimers.git
WORKDIR /app/ecoprimers/src
RUN make clean && make \
&& cp ecoPrimers /usr/local/bin \
&& cp ../tools/ecoPCRFormat.py /usr/local/bin/ecoPCRFormat \
&& chmod +x /usr/local/bin/ecoPCRFormat
WORKDIR /app
RUN git clone --recurse-submodules https://forge.metabarcoding.org/obitools/sumatra.git
WORKDIR /app/sumatra
RUN make clean && make \
&& cp sumatra /usr/local/bin
WORKDIR /app
RUN git clone --recurse-submodules https://forge.metabarcoding.org/obitools/sumaclust.git
WORKDIR /app/sumaclust
RUN make clean && make \
&& cp sumaclust /usr/local/bin
RUN find /usr/local/bin /usr/local/python2/bin /usr/local/python2/lib -type f -exec file {} \; | \
grep -E 'ELF (32-bit|64-bit) (executable|shared object)' | \
cut -d: -f1 | \
xargs -r strip --strip-unneeded || true
RUN pip install "virtualenv<20" && \
virtualenv --system-site-packages /obitools-doc
ENV PATH="/obitools-doc/bin:${PATH}"
RUN pip install "sphinx==1.8.5"
COPY doc /obitools-doc/doc
RUN echo "/doc" > /obitools-doc/doc/sphinx/build_dir.txt
ENV PYTHONPATH="/app"
WORKDIR /obitools-doc/doc/sphinx
RUN make html
RUN cp /app/docserver.sh /usr/local/bin/docserver
RUN chmod +x /usr/local/bin/docserver
#--- Image finale minimaliste ---
FROM python:2.7.17-alpine
LABEL org.opencontainers.image.title="OBITools2 (legacy)"
LABEL org.opencontainers.image.description="Legacy OBITools2 environment for compatibility with older pipelines and benchmarks. Includes OBITools2, ecoPCR, ecoPrimers, sumatra, and sumaclust. Python 2-based software stack. Full documentation embedded in the image."
LABEL org.opencontainers.image.version="latest"
LABEL org.opencontainers.image.authors="Eric Coissac <eric.coissac@metabarcoding.org>"
LABEL org.opencontainers.image.url="https://registry.metabarcoding.org/image/obitools%2Fobitools2"
LABEL org.opencontainers.image.documentation="https://metabarcoding.org/en/obitools/obitools2"
LABEL org.opencontainers.image.source="https://forge.metabarcoding.org/obitools/obitools"
# Dépendances runtime seulement (exemple)
RUN apk add --no-cache \
openssl \
zlib \
libgomp
# Copier Python compilé et libs depuis le builder
COPY --from=builder /usr/local/lib/python2.7/site-packages /usr/local/lib/python2.7/site-packages
COPY --from=builder /usr/local/bin /usr/local/bin
COPY --from=builder /obitools-doc/doc/sphinx/build/html /doc
RUN rm -rf /usr/local/share /usr/local/include /usr/local/lib/pkgconfig /usr/local/lib/python2.7/test && \
find /usr/local/bin /usr/local/python2/bin /usr/local/python2/lib -type f -exec file {} \; | \
grep -E 'ELF (32-bit|64-bit) (executable|shared object)' | \
cut -d: -f1 | \
xargs -r strip --strip-unneeded || true
RUN mkdir -p /data
ENV LD_LIBRARY_PATH=/usr/local/lib
ENV PATH="/usr/local/bin:${PATH}"
VOLUME ["/data"]
WORKDIR /data
CMD ["ash"]
+11
View File
@@ -0,0 +1,11 @@
# Legacy OBITools status
Legacy OBITools is 20 years old. It was developed using Python 2, a language that is no longer supported. Therefore, maintaining this code is impossible. It has now been superseded by OBITools4, the latest version in the OBITools lineage.
In order to enable users to continue using Legacy OBITools, a Docker image has been created and made available on the [metabarcoding.org registry](https://registry.metabarcoding.org). While we discourage using this old version for new projects, being able to run it can still be useful for reproducibility purposes.
You can find more information about using this Docker image on the [relevant page](https://metabarcoding.org/en/obitools/obitools2) of the [new metabarcoding website](https://metabarcoding.org).
All the best,
Eric Coissac
View File
+2
View File
@@ -0,0 +1,2 @@
*.pyc
/.DS_Store
+1
View File
@@ -0,0 +1 @@
/*.pyc
@@ -0,0 +1 @@
/*.pyc
@@ -13,10 +13,6 @@ import sys
try:
from sphinx.setup_command import BuildDoc as ori_build_sphinx
except ImportError:
if not is_serenity() and install_requirements():
log.info("Restarting installation with all dependencies ok")
rerun_with_anothe_python(os.path.realpath(sys.executable))
class build_sphinx(ori_build_sphinx):
'''
@@ -36,3 +32,10 @@ class build_sphinx(ori_build_sphinx):
self.finalize_options()
ori_build_sphinx.run(self)
except ImportError:
if not is_serenity() and install_requirements():
log.info("Restarting installation with all dependencies ok")
rerun_with_anothe_python(os.path.realpath(sys.executable))
-2
View File
@@ -202,6 +202,4 @@ def setup(**attrs):
if 'ext_modules' not in attrs:
attrs['ext_modules'] = EXTENTION
print "$$$$$$$$$$$$$$$$$$$$$$$$$$$",COMMANDS
ori_setup(**attrs)
@@ -0,0 +1 @@
/*.pyc
@@ -0,0 +1 @@
/*.pyc
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
/*.pyc

Some files were not shown because too many files have changed in this diff Show More