Skip to content

Commit

Permalink
Merge pull request #5 from DurhamARC/feature/validator-update
Browse files Browse the repository at this point in the history
Updates to work with new hepdata-validator version
  • Loading branch information
GraemeWatt authored Mar 3, 2020
2 parents 84e4e47 + c359334 commit 039b1b0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
16 changes: 11 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

sudo: required

services:
- docker

Expand All @@ -25,6 +23,14 @@ install:

script:
- "docker build -t $IMAGE_NAME ."
- "docker tag $IMAGE_NAME $IMAGE_NAME_REMOTE:latest"
- "docker login --password=$DOCKER_PASSWORD --username=$DOCKER_USERNAME"
- "docker push $IMAGE_NAME_REMOTE:latest"

deploy:
provider: script
script: TAG_NAME="${TRAVIS_TAG:-latest}" && \
docker tag $IMAGE_NAME $IMAGE_NAME_REMOTE:$TAG_NAME && \
"docker login --password=$DOCKER_PASSWORD --username=$DOCKER_USERNAME" && \
docker push $IMAGE_NAME_REMOTE:$TAG_NAME
on:
repo: HEPData/hepdata-converter-docker
all_branches: true
condition: $TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG
12 changes: 6 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
hepdata-validator
coverage
coveralls
pyyaml
matplotlib
six>=1.7
hepdata-validator==0.2.1
coverage==5.0.3
coveralls==1.11.1
pyyaml==5.3
matplotlib==2.2.5
six==1.14.0

0 comments on commit 039b1b0

Please sign in to comment.