From fcf9567844493cf3cc05a3e58bae06411d83f3f1 Mon Sep 17 00:00:00 2001 From: Christopher Teubert Date: Tue, 30 Nov 2021 13:31:31 -0800 Subject: [PATCH 1/4] Add python3.10 support --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ebbf37fa..bf68accb 100644 --- a/setup.py +++ b/setup.py @@ -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', From d65412ab986497dc3432c141378ed7f09deb2c8b Mon Sep 17 00:00:00 2001 From: Christopher Teubert Date: Tue, 30 Nov 2021 13:31:44 -0800 Subject: [PATCH 2/4] Update version # --- setup.py | 2 +- src/prog_algs/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bf68accb..a84a55ed 100644 --- a/setup.py +++ b/setup.py @@ -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', diff --git a/src/prog_algs/__init__.py b/src/prog_algs/__init__.py index 920df7e5..e861d103 100644 --- a/src/prog_algs/__init__.py +++ b/src/prog_algs/__init__.py @@ -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) From 02fdae3a5187bc9814082721504142b20f01157a Mon Sep 17 00:00:00 2001 From: Christopher Teubert Date: Tue, 30 Nov 2021 13:31:49 -0800 Subject: [PATCH 3/4] Test python3.10 --- .github/workflows/python-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index c7a32fda..58cce9c4 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -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 @@ -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 }} @@ -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 }} From 5f569a514dcfa681a36349f7d1459a3a6f23c7cb Mon Sep 17 00:00:00 2001 From: Christopher Teubert Date: Tue, 30 Nov 2021 13:44:04 -0800 Subject: [PATCH 4/4] Update prog_models requirement --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 22ec70ff..94ead68d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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