Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
teubert committed Jul 30, 2024
1 parent b6b76fa commit 4d18e5b
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: pip-cache
key: pip-cache-datadriven
- name: Install additional dependencies
run: |
pip install coverage
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: pip-cache
key: pip-cache-datadriven
- name: Update
run: pip install --upgrade --upgrade-strategy eager -e .
- name: Run tests
Expand Down Expand Up @@ -439,7 +439,7 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: pip-cache
key: pip-cache-datadriven
- name: Update
run: |
pip install --upgrade --upgrade-strategy eager -e .
Expand Down
26 changes: 25 additions & 1 deletion .github/workflows/update-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7']
python-version: ['3.10']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -24,3 +24,27 @@ jobs:
with:
path: ~/.cache/pip
key: pip-cache

cache-dependencies-data-driven:
timeout-minutes: 15
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install -e '.[datadriven]'
python -m pip install notebook
python -m pip install testbook
python -m pip install requests
- uses: actions/cache@v3
with:
path: ~/.cache/pip
key: pip-cache-datadriven
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ ProgPy combines NASAs prog_models and prog_algs packages into a single python pa
## Installation
`pip3 install progpy`

or

`pip3 install progpy[datadriven]`

to include dependencies for data driven models

## [Documentation](https://nasa.github.io/progpy/)
See documentation [here](https://nasa.github.io/progpy/)

Expand Down
68 changes: 68 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "progpy"
version = "1.7.0-pre"
dependencies = [
"scipy",
"pandas", # For data downloading features
"matplotlib",
"requests", # For data downloading features
"chaospy", # For PCE
"fastdtw", # For DTW error calculation
"filterpy"
]
requires-python = ">=3.7, <3.12"
authors = [
{name = "Christopher Teubert", email = "christopher.a.teubert@nasa.gov"},
{name = "Katelyn Griffith", email = "katelyn.j.griffith@nasa.gov"}
,
{name = "Matteo Corbetta"},
{name = "Chetan Kulkarni"},
{name = "Portia Banerjee"},
{name = "Jason Watkins"},
{name = "Matthew Daigle"}
]
maintainers = [
{name = "Christopher Teubert", email = "christopher.a.teubert@nasa.gov"},
{name = "Katelyn Griffith", email = "katelyn.j.griffith@nasa.gov"}
]
description = "The NASA Prognostic Package (ProgPy) is a python prognostics framework focused on building, using, and evaluating models and algorithms for prognostics (computation of remaining useful life) and health management of engineering systems, and provides a set of prognostics models for select components and prognostics algorithms developed within this framework, including uncertainty propagation."
readme = "README.md"
license = {text = "NOSA"}
keywords = ['prognostics', 'diagnostics', 'fault detection', 'fdir', 'physics modeling', 'prognostics and health management', 'PHM', 'health management', 'surrogate modeling', 'model tuning', 'simulation', 'ivhm']
classifiers = [
'Development Status :: 5 - Production/Stable',

'Intended Audience :: Science/Research',
'Intended Audience :: Developers',
'Intended Audience :: Manufacturing',

'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
'Topic :: Scientific/Engineering :: Physics',

'License :: Other/Proprietary License ',

'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3 :: Only'
]

[project.optional-dependencies]
datadriven = [
"tensorflow; platform_system!='Darwin' or platform_machine!='arm64'",
"tensorflow-macos; platform_system=='Darwin' and platform_machine=='arm64'"]

[project.urls]
Homepage = "https://nasa.github.io/progpy/"
Documentation = "https://nasa.github.io/progpy/"
Repository = "https://github.com/nasa/progpy"
Issues = "https://github.com/nasa/progpy/issues"
Organization = "https://www.nasa.gov/content/diagnostics-prognostics"
62 changes: 0 additions & 62 deletions setup.py

This file was deleted.

0 comments on commit 4d18e5b

Please sign in to comment.