Skip to content

Commit

Permalink
Merge pull request #3882 from voxel51/release/v0.23.0
Browse files Browse the repository at this point in the history
merging release/v0.23.0 into main
  • Loading branch information
findtopher authored Dec 5, 2023
2 parents ad22be4 + c18fd16 commit 1a9f431
Show file tree
Hide file tree
Showing 775 changed files with 44,021 additions and 31,815 deletions.
60 changes: 31 additions & 29 deletions .github/ISSUE_TEMPLATE/bug_report_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,58 @@ name: Bug Report
about: Use this template for reporting bugs encountered while using FiftyOne
title: "[BUG]"
labels: bug
assignees: ''

assignees: ""
---

### Instructions

Thank you for submitting an issue. Please refer to our [issue policy](https://www.github.com/voxel51/fiftyone/blob/develop/ISSUE_POLICY.md) for information on what types of issues we address.
Thank you for submitting an issue. Please refer to our
[issue policy](https://www.github.com/voxel51/fiftyone/blob/develop/ISSUE_POLICY.md)
for information on what types of issues we address.

1. Please fill in this template to ensure a timely and thorough response
2. Place an "x" between the brackets next to an option if it applies. For example:
- [x] Selected option
3. **Please delete everything above this line before submitting the issue**
2. Remove the section instructions but leave the section header
3. Place an "x" between the brackets next to an option if it applies. For
example:
- [x] Selected option
4. **Please delete everything above this line before submitting the issue**

### System information
### Describe the problem

- **OS Platform and Distribution** (e.g., Linux Ubuntu 16.04):
- **Python version** (`python --version`):
- **FiftyOne version** (`fiftyone --version`):
- **FiftyOne installed from** (pip or source):
Describe the problem clearly here. Include descriptions of the expected
behavior and the actual behavior.

### Commands to reproduce
### Code to reproduce issue

As thoroughly as possible, please provide the Python and/or shell commands used to encounter the issue. Application steps can be described in the next section.
Provide a reproducible test case that is the bare minimum necessary to generate
the problem. Please avoid sharing code that relies on your local data or
datasets. Include a short video or screenshot if the bug is in the App.

```
# commands here
# commands and/or screenshots here
```

### Describe the problem

Describe the problem clearly here. Include descriptions of the expected behavior and the actual behavior.

### Code to reproduce issue
### System information

Provide a reproducible test case that is the bare minimum necessary to generate the problem.
- **OS Platform and Distribution** (e.g., Linux Ubuntu 22.04):
- **Python version** (`python --version`):
- **FiftyOne version** (`fiftyone --version`):
- **FiftyOne installed from** (pip or source):

### Other info/logs

Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full traceback. Large logs and files should be attached. Please do not use screenshots for sharing text. Code snippets should be used instead when providing tracebacks, logs, etc.

### What areas of FiftyOne does this bug affect?

- [ ] `App`: FiftyOne application issue
- [ ] `Core`: Core Python library issue
- [ ] `Server`: FiftyOne server issue
Include any logs or source code that would be helpful to diagnose the problem.
If including tracebacks, please include the full traceback. Large logs and
files should be attached. Please do not use screenshots for sharing text. Code
snippets should be used instead when providing tracebacks, logs, etc.

### Willingness to contribute

The FiftyOne Community encourages bug fix contributions. Would you or another member of your organization be willing to contribute a fix for this bug to the FiftyOne codebase?
The FiftyOne Community encourages bug fix contributions. Would you or another
member of your organization be willing to contribute a fix for this bug to the
FiftyOne codebase?

- [ ] Yes. I can contribute a fix for this bug independently
- [ ] Yes. I would be willing to contribute a fix for this bug with guidance from the FiftyOne community
- [ ] Yes. I would be willing to contribute a fix for this bug with guidance
from the FiftyOne community
- [ ] No. I cannot contribute a bug fix at this time
15 changes: 8 additions & 7 deletions .github/workflows/build-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Builds and publishes the fiftyone-db package
on:
push:
tags:
- db-v*
- db-v[0-9]+.[0-9]+.[0-9]+
- db-v[0-9]+.[0-9]+.[0-9]+rc[0-9]+
pull_request:
paths:
- package/db/**
Expand All @@ -23,7 +24,7 @@ jobs:
- windows-x86_64
steps:
- name: Clone fiftyone
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
Expand All @@ -35,7 +36,7 @@ jobs:
env:
RELEASE_TAG: ${{ github.ref }}
run: |
if [[ $RELEASE_TAG =~ ^refs\/tags\/db-v.*-rc\..*$ ]]; then
if [[ $RELEASE_TAG =~ ^refs\/tags\/db-v[0-9]+.[0-9]+.[0-9]+rc[0-9]+ ]]; then
echo "RELEASE_VERSION=$(echo "${{ github.ref }}" | sed "s/^refs\/tags\/db-v//")" >> $GITHUB_ENV
fi
- name: Build Darwin arm64 wheel
Expand Down Expand Up @@ -64,7 +65,7 @@ jobs:
cd package/db
python setup.py sdist
- name: Upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dist-${{ matrix.platform }}
path: package/db/dist/*
Expand All @@ -76,9 +77,9 @@ jobs:
FIFTYONE_DO_NOT_TRACK: true
steps:
- name: Clone fiftyone
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Download fiftyone-db
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: dist-sdist
path: downloads
Expand All @@ -99,7 +100,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/db-v')
steps:
- name: Download
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: downloads
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- win-amd64
steps:
- name: Clone fiftyone
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true
- name: Set up Python 3.8
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
working-directory: package/desktop
run: python setup.py bdist_wheel --plat-name ${{ matrix.platform }}
- name: Upload wheel
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: wheel-${{ matrix.platform }}
path: package/desktop/dist/*.whl
Expand All @@ -83,7 +83,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/desktop-v')
steps:
- name: Download wheels
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: downloads
- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ jobs:
FIFTYONE_DO_NOT_TRACK: true
steps:
- name: Clone fiftyone
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Checkout fiftyone-teams
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: voxel51/fiftyone-teams
path: fiftyone-teams
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
run: |
./docs/generate_docs.bash -t fiftyone-teams
- name: Upload docs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: docs
path: docs/build/html/
Expand All @@ -99,7 +99,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Download docs
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: docs
path: docs-download/
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-graphql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ on:
push:
tags:
- graphql-v*
pull_request:
paths:
- package/graphql/**
- .github/workflows/build-graphql.yml
# pull_request:
# paths:
# - package/graphql/**
# - .github/workflows/build-graphql.yml

jobs:
build:
runs-on: ubuntu-20.04
steps:
- name: Clone fiftyone
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
Expand All @@ -34,18 +34,18 @@ jobs:
cd package/graphql
python setup.py sdist bdist_wheel
- name: Upload wheel(s)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dist
path: package/graphql/dist/*

publish:
runs-on: ubuntu-20.04
needs: [build, test]
needs: [build]
if: startsWith(github.ref, 'refs/tags/db-v')
steps:
- name: Download wheels
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: downloads
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
outputs:
changes: ${{ steps.filter.outputs.changes }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
id: filter
with:
Expand All @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Clone fiftyone
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true
- name: Set up Python 3.8
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Build python
run: make python -o app
- name: Upload dist
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dist
path: dist/
19 changes: 16 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@ on: workflow_call

jobs:
test-e2e:
timeout-minutes: 60
timeout-minutes: 90
runs-on: ubuntu-latest-m
env:
FIFTYONE_DO_NOT_TRACK: true
FIFTYONE_DATABASE_URI: mongodb://localhost:27017
FIFTYONE_DATABASE_NAME: playwright
ELECTRON_EXTRA_LAUNCH_ARGS: "--disable-gpu"
PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/ms-playwright
defaults:
run:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -24,6 +26,11 @@ jobs:
with:
node-version: 18

- name: Start MongoDB
uses: supercharge/[email protected]
with:
mongodb-version: latest

- name: Install setup dependencies
run: |
pip install --upgrade pip setuptools wheel
Expand All @@ -50,7 +57,9 @@ jobs:
run: make app

- name: Install fiftyone
run: pip install .
run: |
pip install .
pip install fiftyone-db-ubuntu2204
- name: Configure
id: test_config
Expand Down Expand Up @@ -97,6 +106,10 @@ jobs:
run: yarn e2e
working-directory: e2e-pw

- name: Lint Playwright tests
run: yarn lint
working-directory: e2e-pw

- name: Upload test report
if: always()
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

all-tests:
runs-on: ubuntu-latest
needs: [build, test]
needs: [build, e2e, test]
if: always()
steps:
- run: sh -c ${{ needs.build.result == 'success' && needs.test.result == 'success' }}
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

publish:
runs-on: ubuntu-latest
needs: [build, test]
needs: [build, e2e, test]
steps:
- name: Download dist
uses: actions/download-artifact@v3
Expand All @@ -42,20 +42,20 @@ jobs:
python3 -m twine upload dist/*
build-image:
needs: [build, test]
needs: [build, e2e, test]
runs-on: ubuntu-20.04
steps:
- name: Clone fiftyone
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Download dist
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: dist
path: dist
- name: docker
run: make docker-export -o python
- name: Upload image
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: docker-image
path: fiftyone.tar.gz
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Cache
id: node-cache
uses: actions/cache@v3
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup
uses: actions/setup-python@v4
id: pip-cache
Expand Down
Loading

0 comments on commit 1a9f431

Please sign in to comment.