Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix marshmallow-enum bug #1746

Merged
merged 7 commits into from
Jul 17, 2023
Merged

fix marshmallow-enum bug #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf0db46
fix marchmallow-enum bug
cosmicBboy Jul 17, 2023
46fb6b7
Remove constraints in requirements.in
eapolinario Jul 17, 2023
7d92b0f
Fix test_dataclass_transformer
eapolinario Jul 17, 2023
7063191
Remove more dev dependencies
eapolinario Jul 17, 2023
853b7d5
Revert "Fix test_dataclass_transformer"
eapolinario Jul 17, 2023
d64f35b
Set upper bound ot dataclasses-json
eapolinario Jul 17, 2023
098eb5f
Set pyyaml version to 5.4.1
eapolinario Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dev-requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-r requirements.in

git+https://github.com/flyteorg/pytest-flyte@main#egg=pytest-flyte
coverage[toml]
hypothesis
joblib
Expand Down
2 changes: 1 addition & 1 deletion doc-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ pytz-deprecation-shim==0.1.0.post0
# via tzlocal
pywavelets==1.4.1
# via imagehash
pyyaml==6.0
pyyaml==5.4.1
# via
# astropy
# cookiecutter
Expand Down
10 changes: 0 additions & 10 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
-e file:.#egg=flytekit
attrs<21
# We need to restrict constrain the versions of both jsonschema and pyyaml because of docker-compose (which is
# used to run integration tests) pins those two libraries. We are in the process of removing docker-compose in
# favor of a more generic solution that involves Flytectl to stand up the sandbox, described in
# https://github.com/flyteorg/flyte/issues/1732.
jsonschema<4
pyyaml<6
# This is required by docker-compose and otherwise clashes with docker-py
websocket-client<1.0.0
# TODO: Remove after buf migration is done and packages updated
packaging<22.0
7 changes: 5 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,19 @@
"python-json-logger>=2.0.0",
"pytimeparse>=1.1.8,<2.0.0",
"pytz",
"pyyaml",
"pyyaml>=6.0.0; python_version>='3.10'",
"pyyaml<6.0.0; python_version<'3.10'",
"keyring>=18.0.1",
"requests>=2.18.4,<3.0.0",
"responses>=0.10.7",
"sortedcontainers>=1.5.9,<3.0.0",
"statsd>=3.0.0,<4.0.0",
"urllib3>=1.22,<2.0.0",
"wrapt>=1.0.0,<2.0.0",
"dataclasses-json>=0.5.2",
# TODO: remove upper-bound after fixing change in contract
"dataclasses-json>=0.5.2,<0.5.12",
"marshmallow-jsonschema>=0.12.0",
"marshmallow-enum",
"natsort>=7.0.1",
"docker-image-py>=0.1.10",
"typing_extensions",
Expand Down