deleted file mode 100644

@@ -1,44 +0,0 @@

-image: gitlab.kwant-project.org:5005/qt/adaptive:latest

-

-stages:

-  - prebuild

-  - test

-

-build docker:

-  stage: prebuild

-  image:

-    name: gcr.io/kaniko-project/executor:debug

-    entrypoint: [""]

-  before_script:

-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json

-    - export CI_REF=${CI_COMMIT_TAG:-latest}

-  script:

-    - /kaniko/executor

-      --context $CI_PROJECT_DIR

-      --dockerfile $CI_PROJECT_DIR/Dockerfile

-      --destination $CI_REGISTRY_IMAGE:$CI_REF

-  only:

-    changes:

-      - Dockerfile

-      - environment.yml

-      - test-requirements.txt

-

-test:

-  stage: test

-  script:

-    - py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

-  artifacts:

-    paths:

-      - htmlcov

-

-authors check:

-  stage: test

-  script:

-    - MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

-    - if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

-  allow_failure: true

-

-check whitespace style:

-  stage: test

-  script: ./check_whitespace

-  allow_failure: true

@@ -1,20 +1,44 @@

-image: quantumtinkerer/research

+image: gitlab.kwant-project.org:5005/qt/adaptive:latest

+

+stages:

+  - prebuild

+  - test

+

+build docker:

+  stage: prebuild

+  image:

+    name: gcr.io/kaniko-project/executor:debug

+    entrypoint: [""]

+  before_script:

+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json

+    - export CI_REF=${CI_COMMIT_TAG:-latest}

+  script:

+    - /kaniko/executor

+      --context $CI_PROJECT_DIR

+      --dockerfile $CI_PROJECT_DIR/Dockerfile

+      --destination $CI_REGISTRY_IMAGE:$CI_REF

+  only:

+    changes:

+      - Dockerfile

+      - environment.yml

+      - test-requirements.txt

 test:

+  stage: test

   script:

-    - pip install -r test-requirements.txt

-    - conda install -y -q scikit-optimize

     - py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

   artifacts:

     paths:

       - htmlcov

 authors check:

+  stage: test

   script:

     - MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

     - if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

   allow_failure: true

 check whitespace style:

+  stage: test

   script: ./check_whitespace

   allow_failure: true

@@ -14,3 +14,7 @@ authors check:

     - MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

     - if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

   allow_failure: true

+

+check whitespace style:

+  script: ./check_whitespace

+  allow_failure: true

@@ -1,4 +1,5 @@

 image: quantumtinkerer/research

+

 test:

   script:

     - pip install -r test-requirements.txt

@@ -7,3 +8,9 @@ test:

   artifacts:

     paths:

       - htmlcov

+

+authors check:

+  script:

+    - MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

+    - if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

+  allow_failure: true

@@ -7,18 +7,3 @@ test:

   artifacts:

     paths:

       - htmlcov

-

-mirror repository:

-  allow_failure: true

-  variables:

-    REPO: "git@github.com:python-adaptive/adaptive.git"

-  before_script:

-    - mkdir ~/.ssh && chmod 700 ~/.ssh

-    - ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts

-    - echo "$DEPLOY_KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa

-  after_script:

-    - rm -rf ~/.ssh

-  script:

-    - ORIGIN_URL=$(git config --get remote.origin.url)

-    - cd $(mktemp -d); git clone --bare $ORIGIN_URL .

-    - git push --mirror $REPO

@@ -2,7 +2,7 @@ image: quantumtinkerer/research

 test:

   script:

     - pip install -r test-requirements.txt

-    - conda install -y -q sckit-optimize

+    - conda install -y -q scikit-optimize

     - py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

   artifacts:

     paths:

@@ -1,7 +1,8 @@

 image: quantumtinkerer/research

 test:

   script:

-    - conda install -y -q pytest-cov scikit-optimize

+    - pip install -r test-requirements.txt

+    - conda install -y -q sckit-optimize

     - py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

   artifacts:

     paths:

@@ -1,7 +1,7 @@

 image: quantumtinkerer/research

 test:

   script:

-    - conda install -y -q pytest-cov

+    - conda install -y -q pytest-cov scikit-optimize

     - py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

   artifacts:

     paths:

@@ -12,11 +12,11 @@ mirror repository:

   variables:

     REPO: "git@github.com:python-adaptive/adaptive.git"

   before_script:

-    - mkdir /root/.ssh && chmod 700 /root/.ssh

-    - ssh-keyscan -t rsa github.com >> /root/.ssh/known_hosts

-    - echo "$DEPLOY_KEY" > /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa

+    - mkdir ~/.ssh && chmod 700 ~/.ssh

+    - ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts

+    - echo "$DEPLOY_KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa

   after_script:

-    - rm -rf /root/.ssh

+    - rm -rf ~/.ssh

   script:

     - ORIGIN_URL=$(git config --get remote.origin.url)

     - cd $(mktemp -d); git clone --bare $ORIGIN_URL .

@@ -6,3 +6,18 @@ test:

   artifacts:

     paths:

       - htmlcov

+

+mirror repository:

+  allow_failure: true

+  variables:

+    REPO: "git@github.com:python-adaptive/adaptive.git"

+  before_script:

+    - mkdir /root/.ssh && chmod 700 /root/.ssh

+    - ssh-keyscan -t rsa github.com >> /root/.ssh/known_hosts

+    - echo "$DEPLOY_KEY" > /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa

+  after_script:

+    - rm -rf /root/.ssh

+  script:

+    - ORIGIN_URL=$(git config --get remote.origin.url)

+    - cd $(mktemp -d); git clone --bare $ORIGIN_URL .

+    - git push --mirror $REPO

@@ -1,4 +1,8 @@

 image: quantumtinkerer/research

 test:

   script:

-     - py.test adaptive

+    - conda install -y -q pytest-cov

+    - py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

+  artifacts:

+    paths:

+      - htmlcov

@@ -1,4 +1,4 @@

-image: adaptive-testing

+image: quantumtinkerer/research

 test:

   script:

      - py.test adaptive

new file mode 100644

@@ -0,0 +1,4 @@

+image: adaptive-testing

+test:

+  script:

+     - py.test adaptive