From 0abf0ef9d0b6634186a38ba2a728234439b70a7b Mon Sep 17 00:00:00 2001 From: Dimitris Tsapetis Date: Thu, 18 Feb 2021 09:37:05 -0500 Subject: [PATCH 1/8] Update azure-pipelines.yml --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 51faafe7f..354761994 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -66,7 +66,6 @@ steps: extraProperties: | sonar.exclusions=**/example/** sonar.python.coverage.reportPaths=./coverage.xml - sonar.branch.name=feature/CI - script: | pip install -r requirements.txt From 56e564fa52e132e2beec40f4e99127cb34427112 Mon Sep 17 00:00:00 2001 From: Dimitris Tsapetis Date: Thu, 18 Feb 2021 09:49:29 -0500 Subject: [PATCH 2/8] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 354761994..02e27d7c9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,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' From 692eb94b99eade2206461f052960404eeaf7f7ae Mon Sep 17 00:00:00 2001 From: Dimitris Tsapetis Date: Thu, 18 Feb 2021 09:57:51 -0500 Subject: [PATCH 3/8] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 02e27d7c9..22266e14e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,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=src --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' From d027fbb1316451733989a7aacc6c01ae10f7f920 Mon Sep 17 00:00:00 2001 From: Dimitris Tsapetis Date: Thu, 18 Feb 2021 10:05:59 -0500 Subject: [PATCH 4/8] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 22266e14e..7a0656134 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -64,7 +64,7 @@ steps: cliProjectName: 'UQpy' cliSources: '.' extraProperties: | - sonar.exclusions=**/example/** + sonar.exclusions=**/example/**, **/tests/** sonar.python.coverage.reportPaths=./coverage.xml - script: | From c628a054a787d1ecc2cfbeb8dd904e95f9ab103b Mon Sep 17 00:00:00 2001 From: Dimitris Tsapetis Date: Thu, 18 Feb 2021 15:16:36 -0500 Subject: [PATCH 5/8] Update README.rst --- README.rst | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index 31a9bdc86..4470ac1fa 100644 --- a/README.rst +++ b/README.rst @@ -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) @@ -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 + From 1bb8d4c6fd603a9aeca8374d263a454e8384d23a Mon Sep 17 00:00:00 2001 From: Dimitris Giovanis <30946950+dgiovanis@users.noreply.github.com> Date: Thu, 11 Mar 2021 12:58:51 -0500 Subject: [PATCH 6/8] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7a0656134..e977e249f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -133,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)' From 449e9b80bdd39f9cb50bba3e100960b5e8752213 Mon Sep 17 00:00:00 2001 From: Dimitris Tsapetis Date: Thu, 11 Mar 2021 15:34:54 -0500 Subject: [PATCH 7/8] Adds github release and anaconda packages in pipeline --- azure-pipelines.yml | 51 +++++++++++++++++++++++++++++++++++---------- meta.yml | 20 ++++++++++++++++++ 2 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 meta.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e977e249f..4423235ba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -130,15 +130,44 @@ steps: displayName: Upload to Test PyPi condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') -# - task: GitHubRelease@1 -# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') -# inputs: -# gitHubConnection: 'SURGroup' -# repositoryName: '$(Build.Repository.Name)' -# action: 'create' -# target: '$(Build.SourceVersion)' -# tagSource: 'userSpecifiedTag' -# tag: 'v$(GitVersion.SemVer)' -# changeLogCompareToRelease: 'lastFullRelease' -# changeLogType: 'commitBased' + - task: GitHubRelease@1 + condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') + inputs: + gitHubConnection: 'SURGroup' + repositoryName: '$(Build.Repository.Name)' + action: 'create' + target: '$(Build.SourceVersion)' + tagSource: 'userSpecifiedTag' + tag: 'v$(GitVersion.SemVer)' + 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') + + diff --git a/meta.yml b/meta.yml new file mode 100644 index 000000000..32c273812 --- /dev/null +++ b/meta.yml @@ -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 \ No newline at end of file From d3539b13ff009cbfc327461654f3564999c68590 Mon Sep 17 00:00:00 2001 From: Dimitris Tsapetis Date: Thu, 11 Mar 2021 16:01:33 -0500 Subject: [PATCH 8/8] Update azure-pipelines.yml --- azure-pipelines.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4423235ba..daa3f54f0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -130,17 +130,17 @@ steps: displayName: Upload to Test PyPi condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - - task: GitHubRelease@1 - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - inputs: - gitHubConnection: 'SURGroup' - repositoryName: '$(Build.Repository.Name)' - action: 'create' - target: '$(Build.SourceVersion)' - tagSource: 'userSpecifiedTag' - tag: 'v$(GitVersion.SemVer)' - changeLogCompareToRelease: 'lastFullRelease' - changeLogType: 'commitBased' +# - task: GitHubRelease@1 +# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') +# inputs: +# gitHubConnection: 'SURGroup' +# repositoryName: '$(Build.Repository.Name)' +# action: 'create' +# target: '$(Build.SourceVersion)' +# tagSource: 'userSpecifiedTag' +# tag: 'v$(GitVersion.SemVer)' +# changeLogCompareToRelease: 'lastFullRelease' +# changeLogType: 'commitBased' - bash: echo "##vso[task.prependpath]$CONDA/bin" displayName: Add conda to PATH