Skip to content

Commit

Permalink
Merge branch 'main' into dev/fix-assets-pathname
Browse files Browse the repository at this point in the history
  • Loading branch information
antonymilne authored Nov 9, 2023
2 parents 529aca0 + 303faa3 commit f2fffdb
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 9 deletions.
1 change: 0 additions & 1 deletion .github/workflows/checks-vizro-ai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ on:

concurrency:
group: checks-ai-${{ github.head_ref }}
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/checks-vizro-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: checks-core-${{ github.head_ref }}
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/lint-vizro-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:

concurrency:
group: lint-${{ github.head_ref }}
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-vizro-ai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:

concurrency:
group: test-integration-${{ github.head_ref }}
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-vizro-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:

concurrency:
group: test-integration-${{ github.head_ref }}
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-unit-vizro-ai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:

concurrency:
group: test-unit-${{ github.head_ref }}
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-unit-vizro-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:

concurrency:
group: test-unit-${{ github.head_ref }}
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Highlights ✨
- A bullet item for the Highlights ✨ category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
-->
<!--
### Removed
- A bullet item for the Removed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
-->
<!--
### Added
- A bullet item for the Added category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
-->
<!--
### Changed
- A bullet item for the Changed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
-->
<!--
### Deprecated
- A bullet item for the Deprecated category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
-->
<!--
### Fixed
- A bullet item for the Fixed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
-->
<!--
### Security
- A bullet item for the Security category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
-->
2 changes: 1 addition & 1 deletion vizro-ai/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ classifiers = [
dependencies = [
"pandas",
"tabulate",
"openai>=0.27.8",
"openai>=0.27.8,<1.0.0", # TODO add support for openai>=1.0.0
"langchain==0.0.325",
"python-dotenv>=1.0.0", # TODO decide env var management to see if we need this
"vizro>=0.1.4", # TODO set upper bound later
Expand Down
2 changes: 1 addition & 1 deletion vizro-ai/snyk/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pandas
tabulate
openai>=0.27.8
openai>=0.27.8,<1.0.0
langchain==0.0.325
python-dotenv>=1.0.0
vizro>=0.1.4
Expand Down

0 comments on commit f2fffdb

Please sign in to comment.