Skip to content

Commit

Permalink
Merge branch 'main' into demo
Browse files Browse the repository at this point in the history
# Conflicts:
#	demo-project/.version
#	package/setup.py
#	package/tests/test_services/test_modular_pipelines.py
  • Loading branch information
jitu5 committed Jul 30, 2024
2 parents aa1d399 + e719f30 commit 140d588
Show file tree
Hide file tree
Showing 159 changed files with 23,633 additions and 15,516 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ updates:
directory: "/package" # Location of package manifests
schedule:
interval: "monthly"
versioning-strategy: increase-if-necessary
versioning-strategy: auto
ignore:
- dependency-name: "types-*"
labels:
Expand Down
Binary file added .github/img/kedro_viz_annotation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
run: |-
node -v
make build
# Renaming README.npm.md to README.md just for npm
- name: Use NPM specific README
run: mv README.npm.md README.md

- name: Publish to npm
run: npm publish
Expand Down
11 changes: 6 additions & 5 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@ tasks:
- name: backend
before: echo PIP_USER=no >> ~/.bashrc && export PIP_USER=no
init: |
pip install "pip==23.3.1" --user
pip install -r package/test_requirements.txt -r demo-project/src/docker_requirements.txt --user
pip install uv
uv pip install "pip==23.3.1" --system
uv pip install -r package/test_requirements.txt -r demo-project/src/docker_requirements.txt --system
# Install latest kedro and all its dependencies.
pip install https://github.com/kedro-org/kedro/archive/main.zip --user
uv pip install https://github.com/kedro-org/kedro/archive/main.zip --system
# force-reinstall kedro to ensure that the latest version from main is installed even when
# its version number is the same as that specified in docker_requirements.txt.
pip install https://github.com/kedro-org/kedro/archive/main.zip --user --force-reinstall --no-deps
uv pip install https://github.com/kedro-org/kedro/archive/main.zip --force-reinstall --no-deps --system
command: |
gp sync-await build_complete
pip install -e package --no-deps
uv pip install -e package --no-deps --system
gp sync-done kedro_installed
make run
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Working on your first pull request? You can learn how from these resources:

- Fork the project
- Develop your contribution in a new branch and open a PR against the `main` branch
- Make sure the CI builds are green (have a look at the section [Running checks locally](#running-checks-locally) below)
- Make sure the CI builds are green (have a look at the section [Running checks locally](#testing-guidelines) below)
- Update the PR according to the reviewer's comments

# Contribution guidelines
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package:
find . -regex ".*/__pycache__" -exec rm -rf {} +
find . -regex ".*\.egg-info" -exec rm -rf {} +
test -f package/kedro_viz/html/index.html || (echo "Built npm package not found; packaging process cancelled."; exit 1)
cd package && python setup.py clean --all
cd package && python setup.py sdist bdist_wheel
cd package && rm -rf build/ dist/
cd package && python -m build

build:
rm -rf build package/build package/dist package/kedro_viz/html pip-wheel-metadata package/kedro_viz.egg-info
Expand Down
291 changes: 0 additions & 291 deletions README.md

This file was deleted.

1 change: 1 addition & 0 deletions README.md
Loading

0 comments on commit 140d588

Please sign in to comment.