Skip to content

Commit

Permalink
Remove pin and pyarrow dependency (mckinsey#279)
Browse files Browse the repository at this point in the history
  • Loading branch information
antonymilne authored Jan 23, 2024
1 parent 29997fe commit dd964af
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 20 deletions.
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# THIS IS NOT DESCRIBING A PACKAGE, but the DEV environment of this mono-repo
# In order to install the packages of this mono-repo from source, refer to the pyproject.toml in the relevant folder

[project]
authors = [
{name = "Vizro Team"}
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))
-->
7 changes: 4 additions & 3 deletions vizro-ai/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ classifiers = [
]
dependencies = [
"pandas",
"pyarrow>=14.0.1", # needed for pandas 3.0, version pinned by Snyk to avoid a vulnerability
"tabulate",
"openai>=0.27.8,<1.0.0", # TODO add support for openai>=1.0.0
"langchain==0.0.329",
Expand Down Expand Up @@ -52,6 +51,8 @@ source_pkgs = ["vizro_ai"]
[tool.pytest.ini_options]
filterwarnings = [
"error",
# Ignore this warning here as it comes from pandas until pandas is made compatible with Python 3.12
'ignore:.*utcfromtimestamp.*:DeprecationWarning'
# Ignore until pandas is made compatible with Python 3.12:
"ignore:.*utcfromtimestamp:DeprecationWarning",
# Ignore until pandas 3 is released:
"ignore:(?s).*Pyarrow will become a required dependency of pandas:DeprecationWarning"
]
1 change: 0 additions & 1 deletion vizro-ai/snyk/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pandas
pyarrow>=14.0.1
tabulate
openai>=0.27.8,<1.0.0
langchain==0.0.329
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))
-->
23 changes: 12 additions & 11 deletions vizro-core/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# THIS IS NOT DESCRIBING A PACKAGE, but the DEV environment of this mono-repo
# In order to install the packages of this mono-repo from source, refer to the pyproject.toml in the relevant folder

[build-system]
build-backend = "hatchling.build"
requires = ["hatchling"]
Expand All @@ -20,13 +17,10 @@ classifiers = [
dependencies = [
"dash>=2.14.1", # 2.14.1 needed for compatibility with werkzeug
"dash_bootstrap_components",
"pandas<2.2",
"pyarrow>=14.0.1", # needed for pandas 3.0, version pinned by Snyk to avoid a vulnerability
"pandas",
"pydantic>=1.10.13", # must be synced with pre-commit mypy hook manually
"dash_mantine_components",
"ipython>=8.10.0", # not directly required, pinned by Snyk to avoid a vulnerability: https://app.snyk.io/vuln/SNYK-PYTHON-IPYTHON-3318382
"numpy>=1.22.2", # not directly required, pinned by Snyk to avoid a vulnerability: https://security.snyk.io/vuln/SNYK-PYTHON-NUMPY-2321970
"tornado>=6.3.2", # not directly required, pinned by Snyk to avoid a vulnerability: https://security.snyk.io/vuln/SNYK-PYTHON-TORNADO-5537286
"setuptools>=65.5.1", # not directly required, pinned by Snyk to avoid a vulnerability: https://security.snyk.io/vuln/SNYK-PYTHON-SETUPTOOLS-3180412
"werkzeug>=3.0.1" # not directly required, pinned by Snyk to avoid a vulnerability: https://security.snyk.io/vuln/SNYK-PYTHON-WERKZEUG-6035177
]
Expand All @@ -39,8 +33,11 @@ requires-python = ">=3.8"

[project.optional-dependencies]
kedro = [
"kedro>=0.17.3, <0.19.2",
"wheel>=0.38.0" # not directly required, pinned by Snyk to avoid a vulnerability: https://security.snyk.io/vuln/SNYK-PYTHON-WHEEL-3180413
"kedro>=0.17.3",
"kedro-datasets", # no longer a dependency of kedro for kedro>=0.19.2
"wheel>=0.38.0", # not directly required, pinned by Snyk to avoid a vulnerability: https://security.snyk.io/vuln/SNYK-PYTHON-WHEEL-3180413,
"ipython>=8.10.0", # not directly required, pinned by Snyk to avoid a vulnerability: https://app.snyk.io/vuln/SNYK-PYTHON-IPYTHON-3318382
"tornado>=6.3.2" # not directly required, pinned by Snyk to avoid a vulnerability: https://security.snyk.io/vuln/SNYK-PYTHON-TORNADO-5537286
]

[project.urls]
Expand Down Expand Up @@ -73,8 +70,12 @@ addopts = [
]
filterwarnings = [
"error",
# Ignore this warning here as it comes from pandas until pandas is made compatible with Python 3.12
"ignore:.*utcfromtimestamp:DeprecationWarning"
# Ignore until pandas is made compatible with Python 3.12:
"ignore:.*utcfromtimestamp:DeprecationWarning",
# Ignore until pandas 3 is released:
"ignore:(?s).*Pyarrow will become a required dependency of pandas:DeprecationWarning",
# Ignore until plotly fixes so the warning is no longer raised:
"ignore:When grouping with a length-1 list-like, you will need to pass a length-1 tuple to get_group:FutureWarning"
]
norecursedirs = ["tests/tests_utils", "tests/js"]
pythonpath = ["tests/tests_utils"]
10 changes: 5 additions & 5 deletions vizro-core/snyk/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
dash>=2.14.1
dash_bootstrap_components
pandas<2.2
pyarrow>=14.0.1
pandas
pydantic>=1.10.13
dash_mantine_components
ipython>=8.10.0
numpy>=1.22.2
tornado>=6.3.2
setuptools>=65.5.1
werkzeug>=3.0.1
kedro>=0.17.3, <0.19.2
kedro>=0.17.3
kedro-datasets
wheel>=0.38.0
ipython>=8.10.0
tornado>=6.3.2

0 comments on commit dd964af

Please sign in to comment.