Merge branch 'develop' into feature/real_estate

This commit is contained in:
kulbinderdio
2023-01-30 15:27:27 +00:00
committed by GitHub
4 changed files with 35 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
name: Trigger Build on Release and PRs to Main
name: Build & Release
env:
OPENBB_ENABLE_QUICK_EXIT: true
@@ -26,30 +26,37 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: windows10_build.yml
token: ${{ secrets.GITHUB_TOKEN }}
wait-for-completion-timeout: 2h
trigger-macos-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
- name: Trigger M1 MacOs Build
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: m1_macos_build.yml
token: ${{ secrets.GITHUB_TOKEN }}
wait-for-completion-timeout: 2h
trigger-intel-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
- name: Trigger Intel MacOs Build
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: intel_macos_build.yml
token: ${{ secrets.GITHUB_TOKEN }}
wait-for-completion-timeout: 2h
trigger-docker-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
- name: Trigger docker Build
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: docker.yml
token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -40,4 +40,4 @@ jobs:
- name: Publishing the Docker image
run: |
docker push "${OPENBBTERMINAL_DOCKER_POETRY_IMAGE}"
if: startsWith(github.ref, 'refs/heads/main') || startsWith(github.ref, 'refs/heads/release/')
if: startsWith(github.ref, 'refs/heads/main')

View File

@@ -1,4 +1,4 @@
name: Nightly Build on the develop branch
name: Nightly Build
env:
OPENBB_ENABLE_QUICK_EXIT: true
@@ -21,30 +21,37 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: windows10_build.yml
token: ${{ secrets.GITHUB_TOKEN }}
wait-for-completion-timeout: 2h
trigger-macos-build:
runs-on: ubuntu-latest
steps:
- name: Trigger M1 MacOs Build
uses: benc-uk/workflow-dispatch@v1
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: m1_macos_build.yml
token: ${{ secrets.GITHUB_TOKEN }}
wait-for-completion-timeout: 2h
trigger-intel-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Intel MacOs Build
uses: benc-uk/workflow-dispatch@v1
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: intel_macos_build.yml
token: ${{ secrets.GITHUB_TOKEN }}
wait-for-completion-timeout: 2h
trigger-docker-build:
runs-on: ubuntu-latest
steps:
- name: Trigger docker Build
uses: benc-uk/workflow-dispatch@v1
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: docker.yml
token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -607,6 +607,10 @@ def get_macro_data(
f"NEW: {df_new_oldest} - {df_new_newest}"
)
if not df.empty:
df = df.groupby(df.index.strftime("%Y-%m")).head(1)
df.index = df.index.strftime("%Y-%m")
except HTTPError:
return console.print(
f"There is no data available for the combination {parameter} and {country}."
@@ -724,6 +728,7 @@ def get_aggregated_macro_data(
).T
(df_rounded, denomination) = transform_by_denomination(country_data_df)
df_rounded.index = pd.DatetimeIndex(df_rounded.index)
return (
df_rounded,