From fd1c99a3505134aff41b9b3841b7bb2bddabde86 Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 10:09:57 +0200 Subject: [PATCH 1/9] Readme: Update Readme --- .github/workflows/publish.yml | 2 +- README.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b7bddbc8..507f0a07 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ on: jobs: - doc: + publish: runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index 76eb7303..5f7605c5 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,7 @@ The source code is currently hosted on GitHub at: https://github.com/lucianolorenti/ceruleo ```sh -git clone https://github.com/lucianolorenti/ruceruleol_pm -pip install [-e] rul_pm +pip install ceruleo ``` From 5b43240ddba4d4ab91e62fe94e979e74560cb63b Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 10:14:34 +0200 Subject: [PATCH 2/9] Dataset: Improve CMAPSS documentation adding the avilable engines --- ceruleo/dataset/catalog/CMAPSS.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ceruleo/dataset/catalog/CMAPSS.py b/ceruleo/dataset/catalog/CMAPSS.py index de4bc1ff..b35fb93b 100644 --- a/ceruleo/dataset/catalog/CMAPSS.py +++ b/ceruleo/dataset/catalog/CMAPSS.py @@ -127,6 +127,14 @@ class CMAPSSDataset(AbstractLivesDataset): [Dataset reference](https://data.nasa.gov/dataset/C-MAPSS-Aircraft-Engine-Simulator-Data/xaut-bemq) + Available models are: + + - FD001 + - FD002 + - FD003 + - FD004 + + Example: ``` py From 8f31aa082ae05211172cc003cefb5bf2144dcbf6 Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 10:40:53 +0200 Subject: [PATCH 3/9] Versioning --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 3a7e2e06..ec21a7cb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 Luciano Lorenti +Copyright (c) 2022 Luciano Lorenti Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 707c7194dda6fccac40dabfc22e8557ccece3265 Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 10:40:55 +0200 Subject: [PATCH 4/9] Versioning --- VERSION | 1 - ceruleo/__init__.py | 2 +- pyproject.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 VERSION diff --git a/VERSION b/VERSION deleted file mode 100644 index 227cea21..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.0.0 diff --git a/ceruleo/__init__.py b/ceruleo/__init__.py index b9f1a5c2..a475c331 100644 --- a/ceruleo/__init__.py +++ b/ceruleo/__init__.py @@ -9,4 +9,4 @@ CACHE_PATH.mkdir(parents=True, exist_ok=True) -__version__ = 2.0 +__version__ = "2.0.0" diff --git a/pyproject.toml b/pyproject.toml index a5cc872a..aef13a16 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,3 +38,5 @@ dynamic = ["version"] [project.optional-dependencies] doc = ["mkdocs"] + + From 4653e6ad1e0d1b1f8577ebcd8a70fc744df95248 Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 10:41:15 +0200 Subject: [PATCH 5/9] =?UTF-8?q?Bump=20version:=202.0.0=20=E2=86=92=202.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ceruleo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceruleo/__init__.py b/ceruleo/__init__.py index a475c331..fb1f3595 100644 --- a/ceruleo/__init__.py +++ b/ceruleo/__init__.py @@ -9,4 +9,4 @@ CACHE_PATH.mkdir(parents=True, exist_ok=True) -__version__ = "2.0.0" +__version__ = "2.1.0" From 17fdc896fea11cbb33f8d97f98addf0328a87ba2 Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 10:42:48 +0200 Subject: [PATCH 6/9] clean --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2d34b707..88b67edd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = ceruleo -version = 2.0.0 +version = 2.1.0 description = Remaining useful life estimation utilities url = https://medium.com/@gmyrianthous keywords = predictive maintenance, remaining useful life From 9d328539f0eb797339f072d4c071237b8917eb52 Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 10:42:49 +0200 Subject: [PATCH 7/9] =?UTF-8?q?Bump=20version:=202.1.0=20=E2=86=92=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ceruleo/__init__.py | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceruleo/__init__.py b/ceruleo/__init__.py index fb1f3595..dfdbff16 100644 --- a/ceruleo/__init__.py +++ b/ceruleo/__init__.py @@ -9,4 +9,4 @@ CACHE_PATH.mkdir(parents=True, exist_ok=True) -__version__ = "2.1.0" +__version__ = "2.2.0" diff --git a/setup.cfg b/setup.cfg index 88b67edd..dc580146 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = ceruleo -version = 2.1.0 +version = 2.2.0 description = Remaining useful life estimation utilities url = https://medium.com/@gmyrianthous keywords = predictive maintenance, remaining useful life From 877885d2c8dca9005f1b362ddeed51f3247cdc62 Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 10:51:41 +0200 Subject: [PATCH 8/9] Add continous deployment --- .bumpversion.cfg | 8 ++++++++ .github/workflows/publish.yml | 10 ++++++++-- ceruleo/__init__.py | 2 +- setup.cfg | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 .bumpversion.cfg diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 00000000..f3770b6f --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,8 @@ +[bumpversion] +current_version = 2.0.0 +commit = True +tag = True + +[bumpversion:file:ceruleo/__init__.py] + +[bumpversion:file:setup.cfg] diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 507f0a07..f496d118 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,15 +11,21 @@ on: jobs: publish: + if: "!contains(github.event.head_commit.message, 'Bump version')" runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - name: Set up Python ${ matrix.python-version }} uses: actions/setup-python@v3 with: python-version: "3.10" + - name: FragileTech/bump-version + uses: FragileTech/bump-version@main + with: + commit_name: Version bumper + commit_email: lucianolorenti@gmail.com + login: lucianolorenti@gmail.com + token: "${{ secrets.TOKEN_GITHUB }}" - name: Install pypa/build run: >- python -m diff --git a/ceruleo/__init__.py b/ceruleo/__init__.py index dfdbff16..a475c331 100644 --- a/ceruleo/__init__.py +++ b/ceruleo/__init__.py @@ -9,4 +9,4 @@ CACHE_PATH.mkdir(parents=True, exist_ok=True) -__version__ = "2.2.0" +__version__ = "2.0.0" diff --git a/setup.cfg b/setup.cfg index dc580146..2d34b707 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = ceruleo -version = 2.2.0 +version = 2.0.0 description = Remaining useful life estimation utilities url = https://medium.com/@gmyrianthous keywords = predictive maintenance, remaining useful life From b6b894f7b1b86b5554ca56233ff1a5fdcbd8ec49 Mon Sep 17 00:00:00 2001 From: Luciano Lorenti Date: Thu, 18 Aug 2022 13:42:06 +0200 Subject: [PATCH 9/9] Update publish --- .github/workflows/publish.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d2f97d07..8b4a5a4e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,16 +18,6 @@ jobs: - name: Set up Python ${ matrix.python-version }} uses: actions/setup-python@v3 with: -<<<<<<< HEAD - python-version: "3.10" - - name: FragileTech/bump-version - uses: FragileTech/bump-version@main - with: - commit_name: Version bumper - commit_email: lucianolorenti@gmail.com - login: lucianolorenti@gmail.com - token: "${{ secrets.TOKEN_GITHUB }}" -======= python-version: "3.10" - name: Bump version run: | @@ -44,7 +34,6 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} branch: main tags: true ->>>>>>> 4e78cb51c368737a91101483a4120e737525b7d6 - name: Install pypa/build run: >- python -m