Skip to content

Commit

Permalink
Merge branch 'main' into remove-registry
Browse files Browse the repository at this point in the history
  • Loading branch information
jlowin committed Jun 17, 2024
2 parents 6fc205a + 7ffe562 commit e3cca0e
Show file tree
Hide file tree
Showing 2,840 changed files with 114,910 additions and 74,735 deletions.
9 changes: 0 additions & 9 deletions .circleci/config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ ignore-regex = .*lazy=\"selectin\"|.*e import Bloc$|America/Nome

ignore-words-list = selectin,aci,wqs,aks,ines,dependant,fsspec,automations,nmme

check-hidden = true
check-hidden = true
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* @PrefectHQ/open-source

# backend
/src/prefect/server @PrefectHQ/open-source @zangell44
/src/prefect/server @PrefectHQ/open-source @zangell44

# ui
/ui @pleek91 @znicholasbrown
/ui @PrefectHQ/frontend

# documentation
/docs @PrefectHQ/docs
Expand All @@ -24,4 +24,4 @@ mkdocs.insiders.yml @PrefectHQ/docs
/tests/events @chrisguidry

# integrations
/src/integrations @desertaxle @zzstoatzz
/src/integrations @desertaxle @zzstoatzz
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/3_feature_enhancement.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ body:
required: true
- label: I searched the Prefect documentation for this feature.
required: true

- type: dropdown
id: version
attributes:
label: Prefect Version
description: Which version of Prefect is this enhancement for?
options:
- 3.x
- 2.x
- 1.x
validations:
Expand All @@ -32,7 +33,7 @@ body:
description: A clear and concise description of what Prefect currently does
validations:
required: true

- type: textarea
attributes:
label: Describe the proposed behavior
Expand Down
17 changes: 5 additions & 12 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,10 @@ If changing documentation, a link to a preview of the page is great.
### Checklist
<!-- These boxes may be checked after opening the pull request. -->

- [ ] This pull request references any related issue by including "closes `<link to issue>`"
- If no issue exists and your change is not a small fix, please [create an issue](https://github.com/PrefectHQ/prefect/issues/new/choose) first.
- [ ] If this pull request adds new functionality, it includes unit tests that cover the changes
- [ ] This pull request includes a label categorizing the change e.g. `maintenance`, `fix`, `feature`, `enhancement`, `docs`.
- [ ] This pull request references any related issue by including "closes `<link to issue>`"
<!-- If you do not have permission to add a label, a maintainer will add one for you -->

For documentation changes:

- [ ] This pull request includes redirect settings in `netlify.toml` for files that are removed or renamed.

For new functions or classes in the Python SDK:

- [ ] This pull request includes helpful docstrings.
- [ ] If a new Python file was added, this pull request contains a stub page in the Python SDK docs and an entry in `mkdocs.yml` navigation.
- If no issue exists and your change is not a small fix, please [create an issue](https://github.com/PrefectHQ/prefect/issues/new/choose) first.
- [ ] If this pull request adds new functionality, it includes unit tests that cover the changes
- [ ] If this pull request removes docs files, it includes redirect settings in `mint.json`.
- [ ] If this pull request adds functions or classes, it includes helpful docstrings.
2 changes: 1 addition & 1 deletion .github/workflows/api-compatibility-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/setup-python@v5
id: setup_python
with:
python-version: 3.12
python-version: "3.12"

- name: UV Cache
# Manually cache the uv cache directory
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/benchmarks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,19 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: "3.10"
cache: "pip"
cache-dependency-path: "requirements*.txt"

- name: UV Cache
uses: actions/cache@v4
id: cache-uv
with:
path: ~/.cache/uv
key: uvcache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ hashFiles('requirements-client.txt', 'requirements.txt', 'requirements-dev.txt') }}


- name: Install packages
run: |
python -m pip install --upgrade pip
pip install --upgrade --upgrade-strategy eager -e ".[dev]"
python -m pip install -U uv
uv pip install --upgrade --system -e .[dev]
- name: Prepare benchmark comparisons
# Note: We use a "cache" instead of artifacts because artifacts are not available
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
build-args: |
PYTHON_VERSION=${{ matrix.python-version }}
${{ ( endsWith(matrix.flavor, 'conda') && 'BASE_IMAGE=prefect-conda' ) || '' }}
${{ ( endsWith(matrix.flavor, 'kubernetes') && 'EXTRA_PIP_PACKAGES=prefect-kubernetes' ) || '' }}
${{ ( endsWith(matrix.flavor, 'kubernetes') && 'PREFECT_EXTRAS=[kubernetes]' ) || '' }}
tags: ${{ join(steps.metadata-dev.outputs.tags) }},${{ join(steps.metadata-prod.outputs.tags) }}
labels: ${{ steps.metadata-dev.outputs.labels }}
push: true
Expand Down
88 changes: 0 additions & 88 deletions .github/workflows/integration-pacakge-tests.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/integration-package-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
id: package_name
run: |
TAG_NAME=${{ github.ref_name }}
PACKAGE_NAME=$(echo $TAG_NAME | sed 's/-[0-9][.0-9]*$//')
PACKAGE_NAME=$(echo $TAG_NAME | sed 's/-[0-9][.0-9]*rc.*$//')
echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_OUTPUT
- name: Set up Python
Expand Down
111 changes: 111 additions & 0 deletions .github/workflows/integration-package-tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
name: Integrations Packages Tests

on:
pull_request:
paths:
- .github/workflows/integration-package-tests.yaml
- "src/**/*.py"
- "src/integrations/**/*"
types: [opened, reopened, synchronize, labeled, unlabeled]
push:
branches:
- main
paths:
- "src/integrations/**/*"

jobs:
prepare-matrix:
# These tests will only run if the integration paths are affected, or someone has
# added the `integrations` label to the PR
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v4
with:
persist-credentials: false
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Generate matrix
id: set-matrix
run: |
if [[ "${{ contains(github.event.pull_request.labels.*.name, 'test-all-integrations') }}" == 'true' ]]; then
# All of the integration packages were changed since 2.19.2, so this is a
# standin for saying "all integrations"
COMMIT_RANGE="2.19.2..${{ github.event.pull_request.head.sha }}"
elif [[ $GITHUB_EVENT_NAME == 'pull_request' ]]; then
COMMIT_RANGE="${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}"
else
COMMIT_RANGE="${{ github.event.before }}..${{ github.event.after }}"
fi
python scripts/generate_integration_package_tests_matrix.py "$COMMIT_RANGE" > matrix.json
cat matrix.json
echo "matrix=$(cat matrix.json)" >> $GITHUB_OUTPUT
run-tests:
timeout-minutes: 20

name: Run Tests for ${{ matrix.package }} on Python ${{ matrix.python-version }}
needs: prepare-matrix
runs-on: ubuntu-latest
strategy:
matrix: ${{fromJson(needs.prepare-matrix.outputs.matrix)}}
fail-fast: false
steps:
- name: Display current test matrix
run: echo '${{ toJSON(matrix) }}'

- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
id: setup_python
with:
python-version: ${{ matrix.python-version }}

- name: UV Cache
# Manually cache the uv cache directory
# until setup-python supports it:
# https://github.com/actions/setup-python/issues/822
uses: actions/cache@v4
id: cache-uv
with:
path: ~/.cache/uv
key: uvcache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ hashFiles(format('src/integrations/{0}/pyproject.toml', matrix.package)) }}

- name: Install dependencies
working-directory: src/integrations/${{ matrix.package }}
# install uv, the package, and bleeding edge prefect
run: |
python -m pip install -U uv
uv pip install --upgrade --system -e .[dev]
uv pip install --upgrade --system -e ../../../
- name: Build dev docker image
if: matrix.package == 'prefect-docker'
run : prefect dev build-image

- name: Run tests
if: matrix.package != 'prefect-ray'
env:
PREFECT_API_DATABASE_CONNECTION_URL: "sqlite+aiosqlite:///./orion-tests.db"
working-directory: src/integrations/${{ matrix.package }}
run: >
pytest tests
--numprocesses auto
--maxprocesses 6
--dist worksteal
# Run prefect-ray tests sequentially to avoid Ray cluster issues
- name: Run tests for prefect-ray
if: matrix.package == 'prefect-ray'
env:
PREFECT_API_DATABASE_CONNECTION_URL: "sqlite+aiosqlite:///./orion-tests.db"
working-directory: src/integrations/${{ matrix.package }}
run: >
pytest tests
Loading

0 comments on commit e3cca0e

Please sign in to comment.