From 346f761caa9ec9c001d16512336b054e673df21b Mon Sep 17 00:00:00 2001
From: "Olivier J.N. Bertrand" <olivier.bertrand@uni-bielefeld.de>
Date: Sun, 1 Apr 2018 13:54:26 +0200
Subject: [PATCH] Change gitlab and source/conf
gitlab has a new step called flake8
conf.py the ipython directive has been removed
---
.gitlab-ci.yml | 19 ++++++++-----------
doc/source/conf.py | 2 --
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdcad33..18f5ddd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,31 +7,28 @@ before_script:
stages:
- build
+ - flake8
- test
build:
script:
- python3 setup.py bdist_wheel
- # an alternative approach is to install and run:
- # - pip3 install dist/*
- # run the command here
- #artifacts:
- # paths:
- # - dist/*.whl
-test:
+flake8:
script:
- #- python3 setup.py test
- - pip3 install --user tox flake8 networkx # you can also use tox
- #- tox -e py36,flake8
+ - pip3 install --user tox flake8
- python3 -m flake8 navipy/*.py
+
+test:
+ script:
+ - pip3 install --user networkx # you can also use tox
- python3 -m unittest discover navipy
pages:
script:
- - pip3 install sphinx sphinx-rtd-theme
+ - pip3 install --user sphinx sphinx-rtd-theme
- cd doc ; make html
- mv build/html/ ../public/
artifacts:
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b11c5c5..c09fb3a 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,8 +33,6 @@ sys.path.insert(0, os.path.abspath('../../src/database/'))
# ones.
extensions = ['matplotlib.sphinxext.only_directives',
'matplotlib.sphinxext.plot_directive',
- 'IPython.sphinxext.ipython_directive',
- 'IPython.sphinxext.ipython_console_highlighting',
'sphinx.ext.autodoc',
'sphinx.ext.doctest',
'sphinx.ext.intersphinx',
--
GitLab