Skip to content

Commit

Permalink
Manually merging feature/Restructuring with Development
Browse files Browse the repository at this point in the history
  • Loading branch information
dgiovanis committed Mar 12, 2021
2 parents 8ae542d + 8531b8e commit 6699306
Show file tree
Hide file tree
Showing 212 changed files with 4,659 additions and 46,343 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Temporary Items
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/misc.xml
Expand Down
2 changes: 0 additions & 2 deletions .idea/.gitignore

This file was deleted.

55 changes: 0 additions & 55 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/other.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2
sphinx:
builder: html
configuration: docs/conf.py
fail_on_warning: true
configuration: docs/source/conf.py
fail_on_warning: False
build:
image: latest
python:
Expand Down
20 changes: 0 additions & 20 deletions Makefile

This file was deleted.

4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Uncertainty Quantification with python (UQpy)

:Authors: Michael D. Shields, Dimitris G. Giovanis, Audrey Olivier, Aakash Bangalore Satish, Mohit Singh Chauhan, Lohit Vandanapu, Ketson RM dos Santos, Katiana Kontolati
:Contact: [email protected]
:Version: 3.0.2
:Version: 3.0.4


Description
Expand Down Expand Up @@ -89,7 +89,7 @@ For assistance with the UQpy software package, please raise an issue on the Gith

.. 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.1/total?style=plastic :alt: GitHub Releases (by Release)
.. 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
Expand Down
Loading

0 comments on commit 6699306

Please sign in to comment.