Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/UCL-CCS/EasyVVUQ into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
wedeling committed May 28, 2020
2 parents c7fdfb6 + 0ecbba0 commit b173358
Show file tree
Hide file tree
Showing 21 changed files with 12,224 additions and 24 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,29 @@ jobs:
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
deploy_conda:
needs:
deploy

runs-on: ubuntu-latest

steps:
- name: Deploy to Conda Cloud
run: |
sleep 5m
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
export PATH="$HOME/miniconda/bin:$PATH"
conda install conda-build
conda install anaconda-client
conda config --add channels conda-forge
conda config --set channel_priority strict
conda skeleton pypi easyvvuq
sed -i 's/dask_jobqueue/dask-jobqueue/g' easyvvuq/meta.yaml
sed -i '/^build:/a\
noarch: python' easyvvuq/meta.yaml
yes | anaconda login --username ${{ secrets.CONDA_USERNAME }} --password ${{ secrets.CONDA_PASSWORD }}
conda config --set anaconda_upload yes
conda build easyvvuq
anaconda logout
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ pep.sh
*.bak
*.db
*.csv
env/
.ipynb_checkpoints/
fusion_pce.*/
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ python:
install:
- pip install -r requirements.txt
- python setup.py develop
- python setup.py build_cannonsim
- pip install pytest-cov
- pip install coveralls
script:
- py.test --pep8 easyvvuq/
- py.test --cov=easyvvuq/ --pep8 tests --ignore=tests/test_vector.py
- py.test --cov=easyvvuq/ --pep8 tests --ignore=tests/test_vector.py --ignore=tests/test_integration.py --ignore=tests/test_worker.py --ignore=tests/test_multisampler.py
after_success:
- coveralls
Loading

0 comments on commit b173358

Please sign in to comment.