Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Sieboldianus committed Aug 27, 2019
2 parents bee811c + 0a91790 commit beaf45b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions .gitlab-ci.yml
@@ -1,11 +1,10 @@
test:
image: continuumio/miniconda3:latest
before_script:
- conda config --add channels conda-forge
- conda env create -f environment_dev.yml
- source activate lbsntransform
image: continuumio/miniconda3:4.6.14
stage: test
script:
- conda config --add channels conda-forge
- conda env create -f environment_dev.yml
- source activate lbsntransform
# test dev install
- pip install -e . --no-dependencies
# create badges
Expand Down
2 changes: 1 addition & 1 deletion lbsntransform/version.py
@@ -1 +1 @@
__version__ = '0.7.1'
__version__ = '0.8.0'

0 comments on commit beaf45b

Please sign in to comment.