Rebase staging from master (#354)

* Rebasing and add skip lint on github actions
quintoandar · Apr 25, 2024 · da91b49 · da91b49 · chip-n-dale · Apr 25, 2024
1 parent 688a5b3
commit da91b49
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 39 deletions.
diff --git a/.github/workflows/skip_lint.yml b/.github/workflows/skip_lint.yml
@@ -0,0 +1,17 @@
+# This step is used only because we want to mark the runner-linter check as required
+# for PRs to develop, but not for the merge queue to merge into develop,
+# github does not have this functionality yet
+
+name: 'Skip github-actions/runner-linter check at merge queue'
+
+on:
+  merge_group:
+
+jobs:
+  empty_job:
+    name: 'github-actions/runner-linter'
+    runs-on: github-actions-developers-runner
+    steps:
+      - name: Skip github-actions/runner-linter check at merge queue
+        run: |
+          echo "Done"
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -2,8 +2,7 @@ name: "Publish Dev Package"
 on:
   push:
     paths:
-      - 'setup.py'
-
+      - "setup.py"
 
 jobs:
   Pipeline:
@@ -13,33 +12,33 @@ jobs:
     container: quintoandar/python-3-7-java
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Install dependencies
-      run: make ci-install
-
-    - name: Get version
-      run: echo "version=$(grep __version__ setup.py | head -1 | cut -d \" -f2 | cut -d \' -f2 )" >> $GITHUB_ENV
-
-    - name: Build package
-      run: make package
-
-    - name: Create release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ env.version }}
-        release_name: Release ${{ env.version }}
-        prerelease: true
-
-    - name: Release already exist
-      if: ${{ failure() }}
-      run: echo Release already exist
-
-    - name: Publish release to pypi.org
-      if: ${{ success() }}
-      env:
-        PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run:  PYTHONPATH=./pip/deps python -m twine upload -u $PYPI_USERNAME -p $PYPI_PASSWORD --verbose dist/*
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: make ci-install
+
+      - name: Get version
+        run: echo "version=$(grep __version__ setup.py | head -1 | cut -d \" -f2 | cut -d \' -f2 )" >> $GITHUB_ENV
+
+      - name: Build package
+        run: make package
+
+      - name: Create release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.version }}
+          release_name: Release ${{ env.version }}
+          prerelease: true
+
+      - name: Release already exist
+        if: ${{ failure() }}
+        run: echo Release already exist
+
+      - name: Publish release to pypi.org
+        if: ${{ success() }}
+        env:
+          PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run: PYTHONPATH=./pip/deps python -m twine upload -u $PYPI_USERNAME -p $PYPI_PASSWORD --verbose dist/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ Preferably use **Added**, **Changed**, **Removed** and **Fixed** topics in each
 
 ## [Unreleased]
 
+## [1.2.4](https://github.com/quintoandar/butterfree/releases/tag/1.2.4)
+* Auto create feature sets ([#351](https://github.com/quintoandar/butterfree/pull/351))
+
 ## [1.2.3](https://github.com/quintoandar/butterfree/releases/tag/1.2.3)
 * Optional params ([#347](https://github.com/quintoandar/butterfree/pull/347))
 
@@ -66,7 +69,7 @@ Preferably use **Added**, **Changed**, **Removed** and **Fixed** topics in each
 * [MLOP-632] Butterfree dev workflow, automate release description ([#279](https://github.com/quintoandar/butterfree/commit/245eaa594846166972241b03fddc61ee5117b1f7))
 
 ### Fixed
-* Change trigger for pipeline staging ([#287](https://github.com/quintoandar/butterfree/pull/287)) 
+* Change trigger for pipeline staging ([#287](https://github.com/quintoandar/butterfree/pull/287))
 
 ## [1.1.2](https://github.com/quintoandar/butterfree/releases/tag/1.1.2)
 ### Fixed
@@ -89,11 +92,11 @@ Preferably use **Added**, **Changed**, **Removed** and **Fixed** topics in each
 * Update README ([#257](https://github.com/quintoandar/butterfree/pull/257))
 
 ### Fixed
-* Fix Butterfree's workflow ([#262](https://github.com/quintoandar/butterfree/pull/262)) 
+* Fix Butterfree's workflow ([#262](https://github.com/quintoandar/butterfree/pull/262))
 * [FIX] Downgrade Python Version in Pyenv ([#227](https://github.com/quintoandar/butterfree/pull/227))
-* [FIX] Fix docs ([#229](https://github.com/quintoandar/butterfree/pull/229)) 
+* [FIX] Fix docs ([#229](https://github.com/quintoandar/butterfree/pull/229))
 * [FIX] Fix Docs - Add more dependencies ([#230](https://github.com/quintoandar/butterfree/pull/230))
-* Fix broken notebook URL ([#236](https://github.com/quintoandar/butterfree/pull/236)) 
+* Fix broken notebook URL ([#236](https://github.com/quintoandar/butterfree/pull/236))
 * Issue #77 Fix ([#245](https://github.com/quintoandar/butterfree/pull/245))
 
 ## [1.0.2](https://github.com/quintoandar/butterfree/releases/tag/1.0.2)
@@ -104,7 +107,7 @@ Preferably use **Added**, **Changed**, **Removed** and **Fixed** topics in each
 * [MLOP-426] Change branching strategy on butterfree to use only master branch ([#216](https://github.com/quintoandar/butterfree/pull/216))
 
 ### Fixed
-* [MLOP-440] Python 3.7 bump and Fixing Dependencies ([#220](https://github.com/quintoandar/butterfree/pull/220)) 
+* [MLOP-440] Python 3.7 bump and Fixing Dependencies ([#220](https://github.com/quintoandar/butterfree/pull/220))
 
 ## [1.0.1](https://github.com/quintoandar/butterfree/releases/tag/1.0.1)
 ### Added
@@ -303,4 +306,4 @@ Preferably use **Added**, **Changed**, **Removed** and **Fixed** topics in each
 * [MLOP-143] Fix Bugs for HouseMain FeatureSet ([#62](https://github.com/quintoandar/butterfree/pull/62))
 
 ## [0.1.0](https://github.com/quintoandar/butterfree/releases/tag/0.1.0)
-* First modules and entities of butterfree package.
+* First modules and entities of butterfree package.
diff --git a/docs/source/butterfree.automated.rst b/docs/source/butterfree.automated.rst
@@ -0,0 +1,19 @@
+butterfree.automated package
+============================
+
+Submodules
+----------
+
+
+.. automodule:: butterfree.automated.feature_set_creation
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: butterfree.automated
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/butterfree.rst b/docs/source/butterfree.rst
@@ -7,6 +7,7 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
+   butterfree.automated
    butterfree.clients
    butterfree.configs
    butterfree.constants

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages, setup
 
 __package_name__ = "butterfree"
-__version__ = "1.2.3.dev0"
+__version__ = "1.2.4"
 __repository_url__ = "https://github.com/quintoandar/butterfree"
 
 with open("requirements.txt") as f: