Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/CI' into feature/Restruc…
Browse files Browse the repository at this point in the history
…turing
  • Loading branch information
dgiovanis committed Mar 12, 2021
2 parents 87085c6 + d3539b1 commit 826a357
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 13 deletions.
21 changes: 12 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
|AzurePipelines| |PyPIdownloads| |PyPI| |Conda| |CondaForge| |LatestRelease| |Binder|

.. |PyPIdownloads| image:: https://img.shields.io/pypi/dm/UQpy?style=plastic :alt: PyPI - Downloads
.. |PyPI| image:: https://img.shields.io/pypi/v/UQpy?style=plastic :alt: PyPI
.. |Conda| image:: https://img.shields.io/conda/dn/conda-forge/UQpy?style=plastic :alt: Conda
.. |CondaForge| image:: https://img.shields.io/conda/v/conda-forge/UQpy?style=plastic :alt: Conda
.. |LatestRelease| image:: https://img.shields.io/github/downloads/SURGroup/UQpy/latest/total?style=plastic :alt: GitHub Releases (by Release)
.. |Binder| image:: https://mybinder.org/badge_logo.svg
:target: https://mybinder.org/v2/gh/SURGroup/UQpy/master
.. |AzurePipelines| image:: https://img.shields.io/azure-devops/build/UQpy/UQpy/1 :alt: Azure DevOps builds


*******************************************
Uncertainty Quantification with python (UQpy)
Expand Down Expand Up @@ -83,17 +94,9 @@ Help and Support

For assistance with the UQpy software package, please raise an issue on the Github Issues page. Please use the appropriate labels to indicate which module you are specifically inquiring about.

.. image:: https://img.shields.io/pypi/dm/UQpy?style=plastic :alt: PyPI - Downloads
.. image:: https://img.shields.io/conda/dn/conda-forge/UQpy?style=plastic :alt: Conda
.. image:: https://img.shields.io/github/downloads/SURGroup/UQpy/V3.0.4/total?style=plastic :alt: GitHub Releases (by Release)

.. image:: https://img.shields.io/pypi/v/UQpy?style=plastic :alt: PyPI
.. image:: https://img.shields.io/conda/v/conda-forge/UQpy?style=plastic :alt: Conda

.. |logo| image:: logo.jpg
:scale: 25 %
:target: https://gihub.com/SURGroup/UQpy


.. image:: https://mybinder.org/badge_logo.svg
:target: https://mybinder.org/v2/gh/SURGroup/UQpy/master

36 changes: 32 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ steps:
cliProjectName: 'UQpy'
cliSources: '.'
extraProperties: |
sonar.exclusions=**/example/**
sonar.exclusions=**/example/**, **/tests/**
sonar.python.coverage.reportPaths=./coverage.xml
sonar.branch.name=feature/CI
- script: |
pip install -r requirements.txt
Expand All @@ -82,7 +81,7 @@ steps:
#python -m pytest tests/*.py --cov=src --cov-report=xml --cov-report=html
#pytest tests/ --cov-config .coveragerc --doctest-modules --junitxml=junit/test-results.xml --cov=src --cov-report=xml --cov-report=html
#echo "##vso[task.setvariable variable=PATH]${PATH}:$(Build.SourcesDirectory)/src/UQpy"
PYTHONPATH=src pytest tests/*.py --cov-config .coveragerc --import-mode=importlib --doctest-modules --junitxml=junit/test-results.xml --cov=UQpy --cov-report=xml --cov-report=html
PYTHONPATH=src pytest tests/*.py --cov-config=.coveragerc --import-mode=importlib --doctest-modules --junitxml=junit/test-results.xml --cov=src --cov-report=xml --cov-report=html
workingDirectory: $(Build.SourcesDirectory)
displayName: 'Test with pytest'
Expand Down Expand Up @@ -134,7 +133,7 @@ steps:
# - task: GitHubRelease@1
# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
# inputs:
# gitHubConnection: 'github.com_dimtsap'
# gitHubConnection: 'SURGroup'
# repositoryName: '$(Build.Repository.Name)'
# action: 'create'
# target: '$(Build.SourceVersion)'
Expand All @@ -143,3 +142,32 @@ steps:
# changeLogCompareToRelease: 'lastFullRelease'
# changeLogType: 'commitBased'

- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')

- bash: conda create --yes --quiet --name myEnvironment
displayName: Create Anaconda environment
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')

- bash: |
source activate myEnvironment
conda install --yes --quiet --name myEnvironment python=$(pythonVersion) conda-build anaconda-client
displayName: Install Anaconda packages
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
- bash: |
source activate myEnvironment
conda build . recipe --variants "{'version': ['$(GitVersion.SemVer)']}"
displayName: Build Noarch conda packages
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
- bash: |
source activate myEnvironment
anaconda login --username $(ANACONDAUSER) --password $(ANACONDAPW)
anaconda upload /usr/share/miniconda/envs/myEnvironment/conda-bld/noarch/*.tar.bz2
displayName: Upload conda packages
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
20 changes: 20 additions & 0 deletions meta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package:
name: uqpy
version: {{ version }}

build:
noarch: python
number: 0

requirements:
host:
- python
- pip
run:
- python

about:
home: https://github.com/SURGroup/UQpy
license: MIT
summary: UQpy is a general purpose Python toolbox for modeling uncertainty in physical and mathematical systems.
doc_url: https://uqpyproject.readthedocs.io

0 comments on commit 826a357

Please sign in to comment.