Skip to content

Commit

Permalink
Merge pull request #115 from nasa/feature/py310
Browse files Browse the repository at this point in the history
  • Loading branch information
teubert committed Dec 1, 2021
2 parents 2a5f334 + 5f569a5 commit 6c404f3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9']

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -2,4 +2,4 @@ filterpy==1.4.5
matplotlib==3.3.2
numpy==1.19.2
scipy==1.5.3
prog_models==1.2.0
prog_models>=1.2.1
5 changes: 3 additions & 2 deletions setup.py
Expand Up @@ -9,7 +9,7 @@

setup(
name = 'prog_algs',
version = '1.2.1',
version = '1.2.2',
description = "The NASA Prognostics Algorithm Package is a framework for model-based prognostics (computation of remaining useful life) of engineering systems. It includes algorithms for state estimation and prediction, including uncertainty propagation. The algorithms use prognostic models (see prog_models) to perform estimation and prediction. The package enables rapid development of prognostics solutions for given models of components and systems. Algorithms can be swapped for comparative studies and evaluations",
long_description=long_description,
long_description_content_type='text/markdown',
Expand All @@ -30,12 +30,13 @@
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3 :: Only'
],
keywords = ['prognostics', 'diagnostics', 'fault detection', 'fdir', 'prognostics and health management', 'PHM', 'health management'],
package_dir = {"":"src"},
packages = find_packages(where = 'src'),
python_requires='>=3.6, <3.10',
python_requires='>=3.6, <3.11',
install_requires = [
'numpy',
'scipy',
Expand Down
2 changes: 1 addition & 1 deletion src/prog_algs/__init__.py
Expand Up @@ -5,7 +5,7 @@

import warnings

__version__ = '1.2.1'
__version__ = '1.2.2'

def run_prog_playback(obs, pred, future_loading, output_measurements, **kwargs):
warnings.warn("Depreciated in 1.2.0, will be removed in a future release.", DeprecationWarning)
Expand Down

0 comments on commit 6c404f3

Please sign in to comment.