git pages

.gitlab-ci.yml

@@ -19,7 +19,7 @@
 # see <http://www.gnu.org/licenses/>.
 
 seamshbuild-linux :
-  image : immc/seamsh-build:v0.1
+  image : immc/seamsh-build:v0.9
   stage : build
   script:
     - cd seamshlib
@@ -36,7 +36,7 @@ seamshbuild-linux :
     expire_in: 1 day
 
 seamshbuild-windows :
-  image : immc/seamsh-build:v0.1
+  image : immc/seamsh-build:v0.9
   stage : build
   script:
     - cd seamshlib
@@ -49,7 +49,7 @@ seamshbuild-windows :
     - python3 setup.py bdist_wheel --plat-name=win_amd64 
 
 seamshbuild-osx :
-  image : immc/seamsh-build:v0.1
+  image : immc/seamsh-build:v0.9
   stage : build
   script:
     - cd seamshlib
@@ -74,8 +74,27 @@ seamshtest :
     - cd tests
     - python3 testshp.py 
 
-mfdeploy-test :
-  image : immc/seamsh-build:v0.1
+pages:
+  image : immc/seamsh-build:v0.9
+  stage : deploy
+  script:
+    - cd seamshlib
+    - mkdir build
+    - cd build/
+    - cmake .. -DCMAKE_BUILD_TYPE=Release
+    - make
+    - cp libseamsh.so ../../seamsh
+    - cd ../../doc
+    - make html
+    - mv _build/html ../public
+  artifacts:
+    paths:
+      - public
+    expire_in: 1 day
+
+
+seamshdeploy-test :
+  image : immc/seamsh-build:v0.9
   stage : deploy
   rules :
     - if: '$CI_COMMIT_TAG =~ /^w-.*$/'
@@ -84,8 +103,8 @@ mfdeploy-test :
     - twine upload --repository testpypi dist/* 
 
 
-mfdeploy :
-  image : immc/seamsh-build:v0.1
+seamshdeploy :
+  image : immc/seamsh-build:v0.9
   stage : deploy
   rules :
     - if: '$CI_COMMIT_TAG =~ /^v-.*$/'

doc/conf.py

@@ -22,7 +22,10 @@ copyright = '2020, Jonathan Lambrechts'
 author = 'Jonathan Lambrechts'
 
 # The full version, including alpha/beta/rc tags
-release = '0.1'
+version = "0.0.1"
+commit_tag = os.environ.get("CI_COMMIT_TAG")
+if commit_tag and (commit_tag.startswith("v-") or commit_tag.startswith("w-")):
+    version = commit_tag[2:]
 
 
 # -- General configuration ---------------------------------------------------

docker/builder/Dockerfile

-# seamsh - Copyright (C) <2010-2020>
+#seamsh - Copyright (C) <2010-2020>
 # <Universite catholique de Louvain (UCL), Belgium
 # 	
 # List of the contributors to the development of seamsh: see AUTHORS file.
@@ -44,7 +44,6 @@ RUN apt update && apt install -y git python3-setuptools python3-wheel twine
 
 RUN apt-get update && apt-get install -y clang patch libssl-dev liblzma-dev libxml2-dev llvm-dev uuid-dev zlib1g-dev
 
-
 RUN useradd -ms /bin/bash validator
 RUN mkdir -p /osxcross && chown validator /osxcross 
 USER validator
@@ -54,6 +53,14 @@ RUN cd /osxcross && SDK_VERSION=10.15 UNATTENDED=1 ./build.sh
 ENV PATH=/osxcross/target/bin/:$PATH
 ENV OSXCROSS_HOST=x86_64-apple-darwin19
 
+
+### doc
+USER root
+RUN apt-get update && apt-get install -y python3-pip gmsh gdal-bin python3-scipy && pip3 install gmsh-dev sphinx sphinx-rtd-theme sphinx-autodoc-typehints gdal
+ENV PYTHONPATH=/usr/local/lib/python3/dist-packages/gmsh-git-Linux64-sdk/lib/
+
+USER validator
+
 VOLUME ["/etc/gitlab-runner"]
 
 WORKDIR /home/validator

setup.py

@@ -44,7 +44,7 @@ setuptools.setup(
     long_description=long_description,
     long_description_content_type="text/markdown",
     include_package_data=True,
-    url="https://www.migflow.be",
+    url="https://git.immc.ucl.ac.be/jlambrechts/seamsh",
     packages=["seamsh"],
     package_dir={"seamsh":"seamsh"},
     #ext_modules=[CMakeExtension("seamshlib")],
@@ -52,7 +52,7 @@ setuptools.setup(
     package_data={"seamsh":["*.so","*.dll","*.dll.a","*.dylib","COPYING.txt","AUTHORS.txt","LICENSE.txt"]},
     classifiers=[
         "Environment :: Console",
-        "Development Status :: 4 - Beta",
+        "Development Status :: 3 - Alpha",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: POSIX :: Linux",
         "Operating System :: Microsoft :: Windows",