Migrate from Gerrit to GitLab

BlueBrain · Jul 8, 2021 · e14ecc1 · e14ecc1
1 parent d3e611d
commit e14ecc1
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 116 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+include:
+   - project: nse/ci
+     file:
+        - /ci/lib/tox-docker.yml
+        - /ci/jobs/check-version.yml
+        - /ci/jobs/check-packaging.yml
+        - /ci/jobs/lint.yml
+        - /ci/jobs/py37.yml
+        - /ci/jobs/py38.yml
+        - /ci/jobs/docs.yml
+        - /ci/jobs/build-package.yml
+        - /ci/jobs/publish-package.yml
+        - /ci/jobs/publish-docs.yml
+        - /ci/jobs/tag.yml
+   - project: neuromath/ci
+     file:
+        - /ci/jobs/auto-release.yml
+
+.tox-template:
+  # Using the same image as DVF
+  image: docker-registry-default.ocp.bbp.epfl.ch/bbp-ou-cells/data-validation-framework:latest
diff --git a/.pylintrc b/.pylintrc
@@ -4,6 +4,7 @@ ignore=version.py
 [MESSAGES CONTROL]
 disable=
 	bad-continuation,
+	duplicate-code,
 	empty-docstring,
 	fixme,
 	invalid-name,

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
@@ -1 +1 @@
-.. include:: ../../CHANGELOG.rst
+.. mdinclude:: ../../CHANGELOG.md
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -46,6 +46,7 @@
     "sphinx.ext.graphviz",
     "sphinx.ext.intersphinx",
     "sphinx.ext.napoleon",
+    "m2r2",
 ]
 
 autoapi_dirs = [

diff --git a/requirements/doc.pip b/requirements/doc.pip
@@ -1,4 +1,5 @@
 graphviz
+m2r2
 sphinx
 sphinx-autoapi
 sphinx-bluebrain-theme
diff --git a/setup.py b/setup.py
@@ -37,7 +37,7 @@
     url="https://bbpteam.epfl.ch/documentation/projects/synthesis-workflow",
     project_urls={
         "Tracker": "https://bbpteam.epfl.ch/project/issues/projects/CELLS/issues",
-        "Source": "ssh://bbpcode.epfl.ch/cells/synthesis-workflow",
+        "Source": "https://bbpgitlab.epfl.ch/neuromath/synthesis-workflow",
     },
     license="BBP-internal-confidential",
     packages=find_packages("src", exclude=["tests"]),

diff --git a/src/version.py b/src/version.py
@@ -1,2 +1,2 @@
 """Package version."""
-VERSION = "0.1.0.dev0"
+VERSION = "0.1.0.dev1"
diff --git a/tox.ini b/tox.ini
@@ -18,7 +18,20 @@ setenv =
     PIP_INDEX_URL = https://bbpteam.epfl.ch/repository/devpi/simple
     PIP_EXTRA_INDEX_URL = https://pypi.python.org/simple
 extras = test
-commands = pytest --basetemp={envtmpdir} --cov={envsitepackagesdir}/{[base]name} --cov={envsitepackagesdir}/{[base]morphval} --cov-branch --no-cov-on-fail --html reports/pytest-{envname}.html --self-contained-html {posargs}
+commands = pytest \
+    -n 4 \
+    --dist loadfile \
+    --basetemp={envtmpdir} \
+    --cov={envsitepackagesdir}/{[base]name} \
+    --cov={envsitepackagesdir}/{[base]morphval} \
+    --cov-branch \
+    --no-cov-on-fail \
+    --cov-report term-missing \
+    --cov-report html:reports/coverage-{envname} \
+    --cov-report xml:reports/coverage-{envname}.xml \
+    --html reports/pytest-{envname}.html \
+    --self-contained-html \
+    {posargs}
 
 [testenv:check-version]
 skip_install = true
@@ -55,7 +68,7 @@ commands =
     black --check --line-length {[base]max_line_length} tests
     black --check --line-length {[base]max_line_length} setup.py
     black --check --line-length {[base]max_line_length} doc/source/conf.py
-    pylint src/{[base]name} src/{[base]morphval} doc/source/conf.py setup.py
+    pylint -j 0 src/{[base]name} src/{[base]morphval} doc/source/conf.py setup.py
 
 [testenv:format]
 skip_install = true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		.. include:: ../../CHANGELOG.rst
		.. mdinclude:: ../../CHANGELOG.md