Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
7b12784
fix: DEV-3901: Paragraph overflow text issue when outliner disabled (…
robot-ci-heartex Dec 6, 2022
9a9304f
feat: DEV-3756: Queue management min backend (#3282)
triklozoid Dec 6, 2022
52ec5be
docs: Add content to clarify SSO page.
anithamuthu2022 Dec 5, 2022
f814536
fix: DEV-3901: Paragraph overflow text issue when outliner disabled (…
robot-ci-heartex Dec 6, 2022
94321b2
Revert package-lock
huguestennier Dec 6, 2022
3963683
fix: Token renewal button [issue #3033] (#3034)
Ben-Epstein Dec 7, 2022
ef6dfe9
ci: bump deps for ubuntu 22.04 runners
farioas Dec 7, 2022
8d5af1d
fix: DEV-3958: Remove WASD (#3386)
robot-ci-heartex Dec 7, 2022
60dd60f
ci: downgrade runners to ubuntu 20.04
farioas Dec 7, 2022
77672ab
feat: DEV-3259: Updated_by field on annotation level for "Update", "A…
hakan458 Dec 7, 2022
58e487a
fix: DEV-3839: Avoid creation of pg_trgm in postgres if it's already …
makseq Dec 7, 2022
10653a1
feat: DEV-3259: Updated_by field on annotation level for "Update", "A…
hakan458 Dec 8, 2022
af9a1e3
Add detailed instruction for local storage (#2179)
MrNightSky Dec 9, 2022
187852a
docs: Fix data manager hotkeys
makseq Dec 9, 2022
ea4ae62
fix: DEV-3719: Pan wasn't working in images from history (#3370)
robot-ci-heartex Dec 12, 2022
dd46c9f
feat: DEV-3259: Updated_by field on annotation level for "Update", "A…
hakan458 Dec 12, 2022
c741d3b
ci: SRE-345: Add make migrations check (#3418)
nikitabelonogov Dec 13, 2022
ae4589d
Revert "feat: DEV-3259: Updated_by field on annotation level for "Upd…
makseq Dec 13, 2022
aa36f4f
fix: DEV-3798: Improve performance for _rearrange_overlap_cohort (#3271)
KonstantinKorotaev Dec 13, 2022
92314e4
fix: DEV-3911: Move persistent storages to OS (#3377)
makseq Dec 13, 2022
4ff2a21
ci: fix wrong syntax
farioas Dec 13, 2022
14dafa8
chore: Bump version to 1.7.1dev (#3422)
robot-ci-heartex Dec 13, 2022
1373c33
feat: DEV-3259: Annotation updated by (#3427)
hakan458 Dec 13, 2022
3c1cb93
fix: DEV-3904: Allow to clear DateTime (#3423)
robot-ci-heartex Dec 14, 2022
e3c87a8
fix: DEV-4035: Fix single choice workaround for several choices tags …
KonstantinKorotaev Dec 14, 2022
68d078f
ci: SRE-364: Add octokit pagination (#3426)
nikitabelonogov Dec 14, 2022
4246bc4
feat: DEV-2715: Audio v3 improvements (#3251)
robot-ci-heartex Dec 14, 2022
2eaf3f6
ci: Fix release branch prefix (#3439)
nikitabelonogov Dec 14, 2022
bc6bbe4
ci: Fix workflow repo (#3440)
nikitabelonogov Dec 14, 2022
b64ed49
Update project templates with new Audio use cases
Dec 14, 2022
421f7a0
ci: use 4 uwsgi workers by default
farioas Dec 15, 2022
938911a
ci: Fix Check parser
nikitabelonogov Dec 15, 2022
7f8d4f6
fix: DEV-4021: export consistency check (#3424)
triklozoid Dec 15, 2022
af9197c
ci: Extend pypi timeout (#3450)
nikitabelonogov Dec 15, 2022
b0d185d
fix: DEV-3664: Grouping modes are not persistent in Outliner when swi…
robot-ci-heartex Dec 15, 2022
fbb61e6
Update auth_setup.md
makseq Dec 15, 2022
8d9be72
Update package-lock.json
makseq Dec 15, 2022
85e71c6
Merge remote-tracking branch 'origin/develop' into DEV-1249
makseq Dec 15, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/build_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ jobs:
core.setOutput("pipy-artifact-url", artifact.url);
core.setOutput("pipy-artifact-digests-sha256", artifact.digests.sha256);
clearInterval(intervalId)
} else if (currentAttempt > MAX_ATTEMPTS) {
} else if (currentAttempt >= MAX_ATTEMPTS) {
clearInterval(intervalId)
throw Error('Max attempts exceeded')
}
}, 6 * 1000)
}, 60 * 1000 )

- name: Attach artifacts to release
if: inputs.release-id
Expand Down
26 changes: 22 additions & 4 deletions .github/workflows/cicd_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,15 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref || github.ref }}

migrations:
name: "Tests"
needs:
- changed_files
if: needs.changed_files.outputs.src == 'true'
uses: heartexlabs/label-studio/.github/workflows/test_migrations.yml@develop
with:
head_sha: ${{ github.event.pull_request.head.sha || github.event.after }}
secrets: inherit

draft-release:
name: "Draft Release"
Expand Down Expand Up @@ -194,11 +203,15 @@ jobs:
process.exit()
}

const {data: tags} = await github.rest.repos.listTags({
const tags = await github.paginate(
github.rest.repos.listTags,
{
owner,
repo,
per_page: 100
});
},
(response) => response.data
);
console.log(`Tags:`)
console.log(tags.map(e => e.name))
const matchedTags = tags.filter(e => e.name.indexOf(version) !== -1)
Expand Down Expand Up @@ -231,10 +244,15 @@ jobs:
console.log(`Previous version: ${previousTag}`)

console.log('Find or Create a Draft release')
const {data: releases} = await github.rest.repos.listReleases({
const releases = await github.paginate(
github.rest.repos.listReleases,
{
owner,
repo,
});
per_page: 100
},
(response) => response.data
);
let release = releases.find(e => target_commitish.endsWith(e.target_commitish) && e.draft)
if (release) {
console.log(`Draft release already exist ${release.html_url}`)
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cut-off-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ jobs:
release_branch="${{ env.RELEASE_BRANCH_PREFIX }}/${first}.${second}.${third}"
next_develop_version="${first}.${second}.$(($third + 1))dev"

echo "release_branch=${release_branch}"
echo "release_version=${release_version}"
echo "next_develop_version=${next_develop_version}"
echo "release_branch=${release_branch}" >> $GITHUB_OUTPUT
echo "release_version=${release_version}" >> $GITHUB_OUTPUT
echo "next_develop_version=${next_develop_version}" >> $GITHUB_OUTPUT

- name: Cut dependencies release branches
uses: actions/github-script@v6
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
git add ${{ env.PYTHON_VERSION_FILE }}
git commit --message "ci: cut release ${{ steps.calculate_branch_name_and_version.outputs.release_version }}"

echo "commit=$(git rev-parse HEAD)"
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
git push origin HEAD:refs/heads/${{ steps.calculate_branch_name_and_version.outputs.release_branch }}

- uses: actions/cache@v3
Expand All @@ -174,15 +174,15 @@ jobs:
git checkout '${{ github.event.repository.default_branch }}'

branch='bump-version-${{ steps.calculate_branch_name_and_version.outputs.next_develop_version }}'
echo "branch=${branch}"
echo "branch=${branch}" >> $GITHUB_OUTPUT
git checkout -b "${branch}"

sed -i "s/^__version__[ ]*=.*/__version__ = '${{ steps.calculate_branch_name_and_version.outputs.next_develop_version }}'/g" ${{ env.PYTHON_VERSION_FILE }}

git add ${{ env.PYTHON_VERSION_FILE }}
git commit --message "chore: Bump version to ${{ steps.calculate_branch_name_and_version.outputs.next_develop_version }}"

echo "commit=$(git rev-parse HEAD)"
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
git push origin HEAD:refs/heads/${branch}

- name: Create PR to 'develop'
Expand Down
35 changes: 22 additions & 13 deletions .github/workflows/docker-release-promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,18 @@ jobs:
github-token: ${{ secrets.GIT_PAT }}
script: |
const {repo, owner} = context.repo;
const {data: checks} = await github.rest.checks.listForRef({
owner,
repo,
ref: 'tags/${{ inputs.release_tag }}',
status: "completed",
})
const check = checks.check_runs.find(e => e.name === '${{ env.DOCKER_IMAGE_TAG_CHECK_NAME }}')
const check_runs = await github.paginate(
github.rest.checks.listForRef,
{
owner,
repo,
ref: 'tags/${{ inputs.release_tag }}',
status: "completed",
per_page: 100
},
(response) => response.data
);
const check = check_runs.find(e => e.name === '${{ env.DOCKER_IMAGE_TAG_CHECK_NAME }}')
const details = JSON.parse(check.output.summary)
console.log(details)
core.setOutput("image_version", details.image_version);
Expand Down Expand Up @@ -83,11 +88,15 @@ jobs:
return +a[1] - b[1]
}

const {data: tags} = await github.rest.repos.listTags({
owner,
repo,
per_page: 100
});
const tags = await github.paginate(
github.rest.repos.listTags,
{
owner,
repo,
per_page: 100
},
(response) => response.data
);
const rawTags = tags.map(e => e.name)
const filteredTags = rawTags.filter(e => e.match(regexp))
const sortedTags = filteredTags
Expand Down Expand Up @@ -284,4 +293,4 @@ jobs:
${{ env.PREFLIGHT_REPO }} \
check container "${image}" \
--submit
done <<< '${{ steps.generate-tags.outputs.redhat-tags }},'
done <<< '${{ steps.generate-tags.outputs.redhat-tags }},'
86 changes: 86 additions & 0 deletions .github/workflows/test_migrations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: "Tests"

on:
workflow_call:
inputs:
head_sha:
required: true
type: string

env:
NODE: '14'
CACHE_NAME_PREFIX: v1

jobs:
migrations:
name: "migrations"
runs-on: ubuntu-20.04
timeout-minutes: 20
env:
DJANGO_SETTINGS_MODULE: core.settings.label_studio
COVERAGE_PROCESS_START: 1
LOG_DIR: pytest_logs
collect_analytics: true
DEBUG_CONTEXTLOG: true
LABEL_STUDIO_TEST_ENVIRONMENT: false
SENTRY_ENVIRONMENT: tests-ubuntu-sqlite
SENTRY_RATE: 0
DJANGO_DB: sqlite
JSON_LOG: 0
# SENTRY_DSN:

steps:
- uses: hmarr/[email protected]

- name: Checkout
uses: actions/checkout@v3
with:
ref: ${{ inputs.ref }}

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: '3.9'

- name: Install OS dependencies
run: |
sudo apt-get update
sudo apt-get install libsasl2-dev python3-dev libldap2-dev libssl-dev libxml2-dev libxslt-dev

- uses: actions/cache@v3
name: Configure pip cache
id: pip-cache
with:
# Cache the Python package environment, excluding pip and setuptools and label_studio* installed by setup-python
path: |
~/.cache/pip
${{ env.pythonLocation }}/bin/*
${{ env.pythonLocation }}/include
${{ env.pythonLocation }}/lib/python*/site-packages/*
!${{ env.pythonLocation }}/bin/pip*
!${{ env.pythonLocation }}/lib/python*/site-packages/pip*
!${{ env.pythonLocation }}/lib/python*/site-packages/setuptools*
!${{ env.pythonLocation }}/lib/python*/site-packages/label_studio*
key: ${{ runner.os }}-pip-${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/requirements-test.txt') }}
restore-keys: |
${{ env.CACHE_NAME_PREFIX }}-${{ runner.os }}-pip-django-${{ env.pythonLocation }}-

- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
pip install --upgrade cython
pip install -U pip==20.2
pip install -r deploy/requirements.txt -r deploy/requirements-test.txt
pip install -e .

- name: Test migrations
run: |
output=$(python label_studio/manage.py makemigrations)
if ! grep 'No changes detected' <<< "${output}"; then
error="${output}"
error="${error//'%'/'%25'}"
error="${error//$'\n'/'%0A'}"
error="${error//$'\r'/'%0D'}"
echo "::error::${error}"
exit 1
fi
15 changes: 9 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ on:

env:
NODE: '14'
CACHE_NAME_PREFIX: v1

jobs:
run_pytest_sqlite:
name: LS SQLite Ubuntu
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -58,7 +59,7 @@ jobs:
name: Configure pip cache
id: pip-cache
with:
# Cache the Python package environment, excluding pip and setuptools installed by setup-python
# Cache the Python package environment, excluding pip and setuptools and label_studio* installed by setup-python
path: |
~/.cache/pip
${{ env.pythonLocation }}/bin/*
Expand All @@ -67,9 +68,10 @@ jobs:
!${{ env.pythonLocation }}/bin/pip*
!${{ env.pythonLocation }}/lib/python*/site-packages/pip*
!${{ env.pythonLocation }}/lib/python*/site-packages/setuptools*
!${{ env.pythonLocation }}/lib/python*/site-packages/label_studio*
key: ${{ runner.os }}-pip-${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/requirements-test.txt') }}
restore-keys: |
${{ runner.os }}-pip-${{ env.pythonLocation }}-
${{ env.CACHE_NAME_PREFIX }}-${{ runner.os }}-pip-django-${{ env.pythonLocation }}-

- name: Install dependencies
run: |
Expand Down Expand Up @@ -121,7 +123,7 @@ jobs:

run_pytest_postgresql:
name: LS PostgreSQL Ubuntu
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -198,7 +200,7 @@ jobs:
name: Configure pip cache
id: pip-cache
with:
# Cache the Python package environment, excluding pip and setuptools installed by setup-python
# Cache the Python package environment, excluding pip and setuptools and label_studio* installed by setup-python
path: |
~/.cache/pip
${{ env.pythonLocation }}/bin/*
Expand All @@ -207,9 +209,10 @@ jobs:
!${{ env.pythonLocation }}/bin/pip*
!${{ env.pythonLocation }}/lib/python*/site-packages/pip*
!${{ env.pythonLocation }}/lib/python*/site-packages/setuptools*
!${{ env.pythonLocation }}/lib/python*/site-packages/label_studio*
key: ${{ runner.os }}-pip-${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/requirements-test.txt') }}
restore-keys: |
${{ runner.os }}-pip-${{ env.pythonLocation }}-
${{ env.CACHE_NAME_PREFIX }}-${{ runner.os }}-pip-django-${{ env.pythonLocation }}-

- name: Install pip dependencies
run: |
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/upstream_repo_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ env:
NODE: 14
CACHE_NAME_PREFIX: v1
STATIC_DIST: 'label_studio/frontend/dist'
RELEASE_BRANCH_PREFIX: "ls-release/"

jobs:
open:
Expand Down Expand Up @@ -140,7 +141,7 @@ jobs:

branch_name='${{ steps.get-pr.outputs.branch-name }}'

if grep -q '^ls-release/.*$' <<< '${{ github.event.client_payload.base_branch_name }}'; then
if grep -q '^${{ env.RELEASE_BRANCH_PREFIX }}.*$' <<< '${{ github.event.client_payload.base_branch_name }}'; then
git checkout '${{ github.event.client_payload.base_branch_name }}'
else
git checkout '${{ github.event.repository.default_branch }}'
Expand Down Expand Up @@ -175,6 +176,7 @@ jobs:
uses: actions/github-script@v6
env:
TITLE: ${{ github.event.client_payload.title }}
RELEASE_BRANCH_PREFIX: "${{ env.RELEASE_BRANCH_PREFIX }}"
with:
github-token: ${{ secrets.GIT_PAT }}
script: |
Expand All @@ -200,7 +202,7 @@ jobs:
}
} else {
let base = '${{ github.event.repository.default_branch }}'
if ( '${{ github.event.client_payload.base_branch_name }}'.startsWith('lse-release/') ) {
if ( '${{ github.event.client_payload.base_branch_name }}'.startsWith(process.env.RELEASE_BRANCH_PREFIX) ) {
base = '${{ github.event.client_payload.base_branch_name }}'
}
const createPullResponse = await github.rest.pulls.create({
Expand Down Expand Up @@ -238,12 +240,16 @@ jobs:
let openPRs = []
for (let submodule of submodules) {
core.info(`Checking ${ submodule.owner }/${ submodule.repo }`)
const { data: listAllOpenPulls } = await github.rest.pulls.list({
owner: submodule.owner,
repo: submodule.repo,
status: 'open',
per_page: 100
});
const listAllOpenPulls = await github.paginate(
github.rest.pulls.list,
{
owner: submodule.owner,
repo: submodule.repo,
status: 'open',
per_page: 100
},
(response) => response.data
);

const listOpenPulls = listAllOpenPulls.filter(e => e.head.ref.toLowerCase() === branchNameLowerCase)

Expand Down
Loading