Develop (#2)

* Build osx and win

* Relax test

* Bump version

* Bump version

* Remove mongo dependency

IMP should not depend on libmonogo
(moved to chinet repo)

* Remove mongo dependency

IMP should not depend on libmonogo
(moved to chinet repo)

---------

Co-authored-by: tpeulen <thomas.peulen@posteo.de>

.gitlab-ci.yml

@@ -42,23 +42,23 @@ build:lnx_x86:
 #  tags:
 #    - aarch64
 
-#build:osx:
-#  <<: *build_posix
-#  tags:
-#    - osx
-#  before_script:
-#    - git submodule foreach git pull
-#
-#build:windows:
-#  <<: *build
-##  image: mambaforge:vs16
-#  tags:
-#    - win
-#  script:
-#    - cmd.exe
-#    - conda activate base
-#    - cd tools && git pull --force && cd..
-#    - .\tools\build.bat
+build:osx:
+  <<: *build_posix
+  tags:
+    - osx
+  before_script:
+    - git submodule foreach git pull
+
+build:windows:
+  <<: *build
+#  image: mambaforge:vs16
+  tags:
+    - win
+  script:
+    - cmd.exe
+    - conda activate base
+    - cd tools && git pull --force && cd..
+    - .\tools\build.bat
 
 test:linux:
   stage: test

CMakeLists.txt

@@ -29,7 +29,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/tools)
   SET(SWIG_EXECUTABLE swig CACHE STRING "Swig program")
 
-
   IF(APPLE)
 
     FIND_PACKAGE(Threads)
@@ -72,6 +71,11 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 
   imp_build_module(${CMAKE_SOURCE_DIR} bff)
 
+#  # libmongoc
+#  ###########################
+#  FIND_PACKAGE (mongoc-1.0 1.7 REQUIRED)
+#  LINK_LIBRARIES (mongo::mongoc_shared)
+
 else()
   INCLUDE(ModuleBuild.cmake)
 endif()

Setup.cmake

@@ -1,9 +1,3 @@
-
-# libmongoc
-###########################
-FIND_PACKAGE (mongoc-1.0 1.7 REQUIRED)
-LINK_LIBRARIES (mongo::mongoc_shared)
-
 # SIMD
 ###########################
 IF(NOT APPLE)

conda-recipe/build.sh

@@ -1,10 +1,4 @@
 #!/bin/bash
-git submodule update --recursive --init --remote
-cd doc
-mkdir -p _build/html/stable/api
-doxygen
-$PYTHON ../tools/doxy2swig.py _build/xml/index.xml ../pyext/documentation.i
-cd ..
 
 mkdir build
 cd build
@@ -14,4 +8,3 @@ ninja install -k 0 -j 4
 # Copy examples
 mkdir $PREFIX/share/doc/IMP/examples/bff
 cp -r ../examples/* $PREFIX/share/doc/IMP/examples/bff
-

conda-recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "0.10.0" %}
+{% set version = "0.14.0" %}
 
 package:
   name: imp.bff
@@ -32,14 +32,14 @@ requirements:
     - cereal
     - mpir  # [win]
     - msmpi  # [win]
-    - libmongoc
+#    - libmongoc
     - imp
   run:
     - {{ pin_compatible('numpy') }}
     - python
     - {{ pin_compatible('imp', max_pin='x.x') }}
     - boost-cpp
-    - libmongoc
+#    - libmongoc
     - pandas
     - mdtraj
     - tqdm

docker/Dockerfile

@@ -0,0 +1,12 @@
+FROM ubuntu:22.04
+LABEL authors="tpeulen"
+
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y tzdata
+RUN apt install -y vim build-essential git cmake net-tools gdb clang
+
+RUN DEBIAN_FRONTEND="noninteractive" apt-get update \
+    && apt-get install -y ninja-build \
+    && apt-get clean
+
+WORKDIR /work
+#ENTRYPOINT ["top", "-b"]