Skip to content

Commit

Permalink
Backport to 1.2.x - fix marshmallow-enum bug (#1746) (#1754)
Browse files Browse the repository at this point in the history
* fix marshmallow-enum bug (#1746)

* fix marchmallow-enum bug

Signed-off-by: Niels Bantilan <[email protected]>

* Remove constraints in requirements.in

Signed-off-by: eduardo apolinario <[email protected]>

* Fix test_dataclass_transformer

Signed-off-by: eduardo apolinario <[email protected]>

* Remove more dev dependencies

Signed-off-by: eduardo apolinario <[email protected]>

* Revert "Fix test_dataclass_transformer"

This reverts commit 7d92b0f.

Signed-off-by: eduardo apolinario <[email protected]>

* Set upper bound ot dataclasses-json

Signed-off-by: eduardo apolinario <[email protected]>

* Set pyyaml version to 5.4.1

Signed-off-by: eduardo apolinario <[email protected]>

---------

Signed-off-by: Niels Bantilan <[email protected]>
Signed-off-by: eduardo apolinario <[email protected]>
Co-authored-by: eduardo apolinario <[email protected]>

* Do not use latest tag in images

Signed-off-by: eduardo apolinario <[email protected]>

* Linting and replace pyyaml

Signed-off-by: eduardo apolinario <[email protected]>

* Regenerate doc-requirements

Signed-off-by: eduardo apolinario <[email protected]>

* Bring .readthedocs.yml back

Signed-off-by: eduardo apolinario <[email protected]>

---------

Signed-off-by: Niels Bantilan <[email protected]>
Signed-off-by: eduardo apolinario <[email protected]>
Co-authored-by: Niels Bantilan <[email protected]>
Co-authored-by: eduardo apolinario <[email protected]>
  • Loading branch information
3 people authored Jul 19, 2023
1 parent ff1db34 commit 411f1ac
Show file tree
Hide file tree
Showing 7 changed files with 323 additions and 254 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ jobs:
images: |
ghcr.io/${{ github.repository_owner }}/flytekit
tags: |
py${{ matrix.python-version }}-latest
py${{ matrix.python-version }}-${{ github.sha }}
py${{ matrix.python-version }}-${{ needs.deploy.outputs.version }}
- name: Build & Push Flytekit Python${{ matrix.python-version }} Docker Image to Github Registry
Expand All @@ -125,7 +124,6 @@ jobs:
images: |
ghcr.io/${{ github.repository_owner }}/flytekit
tags: |
py${{ matrix.python-version }}-sqlalchemy-latest
py${{ matrix.python-version }}-sqlalchemy-${{ github.sha }}
py${{ matrix.python-version }}-sqlalchemy-${{ needs.deploy.outputs.version }}
- name: Push SQLAlchemy Image to GitHub Registry
Expand Down Expand Up @@ -168,7 +166,6 @@ jobs:
images: |
ghcr.io/${{ github.repository_owner }}/external-plugin-service
tags: |
latest
${{ github.sha }}
${{ needs.deploy.outputs.version }}
- name: Push External Plugin Service Image to GitHub Registry
Expand Down Expand Up @@ -210,7 +207,6 @@ jobs:
images: |
ghcr.io/${{ github.repository_owner }}/flytekit
tags: |
spark-latest
spark-${{ github.sha }}
spark-${{ needs.deploy.outputs.version }}
- name: Push Spark Image to GitHub Registry
Expand Down
23 changes: 23 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

build:
os: ubuntu-20.04
tools:
python: "3.9"
apt_packages:
- graphviz

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py

# Optionally set the version of Python and requirements required to build your docs
python:
install:
- requirements: doc-requirements.txt
- requirements: docs/requirements.txt
1 change: 0 additions & 1 deletion dev-requirements.in
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
3 changes: 1 addition & 2 deletions doc-requirements.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.
-e file:.#egg=flytekit

grpcio<=1.49.1
grpcio
git+https://github.com/flyteorg/furo@main
sphinx
sphinx-gallery
Expand Down
Loading

0 comments on commit 411f1ac

Please sign in to comment.