Commit c948eab8 authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Merge branch 'develop'

parents c2c6cef3 e8a778ce

.gitignore

+2 −0
Changes for .gitignore: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,3 +10,5 @@ MANIFEST 
prrt.cpython*.so

prrt.so

.ipynb_checkpoints/

.idea/

.venv/

.gitlab-ci.yml

+5 −3
Changes for .gitlab-ci.yml: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ build:prrt: 
    - which cmake

    - which gcc

    - which g++

    - pip3 list | grep Cython

    - pip3 list | grep numpy

    - CC=gcc-5 CXX=g++-5 cmake . -DPRRT_TESTS=1

    - pip3 list --format=legacy | grep Cython

    - pip3 list --format=legacy | grep numpy

    - CC=gcc-5 CXX=g++-5 cmake .

    - make



build:container:
@@ -65,6 +65,8 @@ test:prrt_functional: 
  tags:

    - bash

  script:

    - CC=gcc-5 CXX=g++-5 cmake . -DPRRT_TESTS=1

    - make

    - exec ./prrtTests



test:prrt_python_bindings:

Pipfile

0 → 100644
+20 −0
Changes for Pipfile: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line 
[[source]]

name = "pypi"

url = "https://pypi.org/simple"

verify_ssl = true



[dev-packages]



[packages]

Cython = "*"

jupyter = "*"

numpy = "*"

pandas = "*"

matplotlib = "*"

ruamel-yaml = "*"

scikit-learn = "*"

graphviz = "*"

prrt = {editable = true, path = "."}



[requires]

python_version = "3.6"