Skip to content

Commit

Permalink
Merge branch 'main' into feature/melscale-frequency
Browse files Browse the repository at this point in the history
  • Loading branch information
Tarek committed Mar 8, 2024
2 parents acaf159 + 6e29859 commit 9e5ba88
Show file tree
Hide file tree
Showing 181 changed files with 4,151 additions and 3,006 deletions.
4 changes: 2 additions & 2 deletions .github/actions/setup-pnpm/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ runs:
using: composite
steps:
- name: Install pnpm ${{ inputs.pnpm-version }}
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: ${{ inputs.pnpm-version }}
- name: Set up Node.js ${{ inputs.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: pnpm
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-poetry/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ runs:
- name: Set up Python ${{ inputs.python-version }} with cache
id: setup-python-with-cache
if: inputs.install-dependencies != 'false'
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}
cache: poetry
- name: Set up Python ${{ inputs.python-version }}
if: inputs.install-dependencies == 'false'
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}
- name: Install dependencies
Expand Down
90 changes: 46 additions & 44 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry environment'
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '⬢ Set up pnpm environment'
Expand All @@ -51,7 +51,7 @@ jobs:
steps:
- name: '🔍 Check if pull request'
id: check-pr
uses: 8BitJonny/gh-get-current-pr@2.2.0
uses: 8BitJonny/gh-get-current-pr@3.0.0
with:
filterOutClosed: true
outputs:
Expand All @@ -65,7 +65,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry environment'
Expand All @@ -75,7 +75,7 @@ jobs:
uses: ./.github/actions/setup-pnpm
- name: Run shellcheck
if: success() || steps.setup.outcome == 'success'
uses: ludeeus/action-shellcheck@master
uses: ludeeus/action-shellcheck@2.0.0
with:
ignore_paths: .venv node_modules
- name: Audit dependencies
Expand All @@ -100,38 +100,40 @@ jobs:
# action, so use it as check.
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: '🧱 Build test matrix for pull request'
if: needs.check-pr.outputs.is-pr == 'true'
uses: druzsan/setup-matrix@v1
uses: druzsan/setup-matrix@v2
with:
matrix: |
os: ubuntu-latest,
python-version: 3.8 3.9 3.10 3.11
os: [ubuntu-latest]
python-version: [3.8, 3.9, 3.10, 3.11]
- name: '🧱 Build test matrix for release'
if: env.MATRIX == '' && startsWith(github.ref, 'refs/tags/v')
uses: druzsan/setup-matrix@v1
uses: druzsan/setup-matrix@v2
with:
matrix: |
os: ubuntu-latest windows-latest macos-latest,
python-version: 3.8 3.9 3.10 3.11
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.8, 3.9, 3.10, 3.11]
- name: '🧱 Build test matrix for main branch'
if: env.MATRIX == '' && github.ref == 'refs/heads/main'
uses: druzsan/setup-matrix@v1
uses: druzsan/setup-matrix@v2
with:
matrix: |
os: ubuntu-latest,
python-version: 3.8 3.9 3.10 3.11
include: |
os: windows-latest python-version: 3.8,
os: macos-latest python-version: 3.8
os: [ubuntu-latest]
python-version: [3.8, 3.9, 3.10, 3.11]
include:
- os: windows-latest
python-version: 3.8
- os: macos-latest
python-version: 3.8
- name: '🧱 Build test matrix for development branch'
if: env.MATRIX == ''
uses: druzsan/setup-matrix@v1
uses: druzsan/setup-matrix@v2
with:
matrix: |
os: ubuntu-latest,
python-version: 3.8
os: [ubuntu-latest]
python-version: [3.8]
- name: Print matrix
run: echo "$MATRIX" | yq -P '{"matrix":.}'
- name: Set output
Expand All @@ -146,15 +148,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry environment'
uses: ./.github/actions/setup-poetry
- name: '📝 Build API docs'
run: make docs
- name: '📥 Store API docs'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs-${{ needs.prepare-python.outputs.version }}
path: build/docs/api/
Expand All @@ -166,7 +168,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry environment'
Expand All @@ -178,7 +180,7 @@ jobs:
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')
run: make all-datasets
- name: '📥 Store datasets'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: datasets-${{ needs.prepare-python.outputs.version }}
path: build/datasets/
Expand All @@ -191,7 +193,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry'
Expand All @@ -203,15 +205,15 @@ jobs:
- name: '🧱 Build frontend'
run: make build-frontend
- name: '📥 Store frontend'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: .frontend-${{ needs.prepare-python.outputs.version }}
path: build/frontend/
if-no-files-found: error
- name: Build Spotlight
run: make build-wheel
- name: '📥 Store Spotlight'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: renumics-spotlight-${{ needs.prepare-python.outputs.version }}
path: build/dist/renumics_spotlight*.whl
Expand All @@ -225,13 +227,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry environment'
uses: ./.github/actions/setup-poetry
- name: '📤 Restore Spotlight Wheel'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: renumics-spotlight-${{ needs.prepare-python.outputs.version }}
path: build/dist
Expand All @@ -245,7 +247,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry environment'
Expand All @@ -262,7 +264,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry environment'
Expand All @@ -286,18 +288,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry environment'
uses: ./.github/actions/setup-poetry
- name: '📤 Restore datasets'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: datasets-${{ needs.prepare-python.outputs.version }}
path: build/datasets/
- name: '📤 Restore frontend'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: .frontend-${{ needs.prepare-python.outputs.version }}
path: build/frontend/
Expand Down Expand Up @@ -357,7 +359,7 @@ jobs:
&& github.event.pull_request.head.repo.full_name == 'Renumics/spotlight'
)
)
uses: LanceMcCarthy/Action-AzureBlobUpload@v2
uses: LanceMcCarthy/Action-AzureBlobUpload@v3
with:
connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
container_name: github-public
Expand All @@ -369,9 +371,9 @@ jobs:
success()
|| steps.setup-chromedriver.outcome == 'success'
|| steps.setup-geckodriver.outcome == 'success'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: .ui-test-${{ needs.prepare-python.outputs.version }}
name: .ui-test-${{ matrix.browser }}-${{ needs.prepare-python.outputs.version }}
path: build/ui_tests
if-no-files-found: error
integration-test:
Expand All @@ -387,7 +389,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '🐍 Set up Poetry'
Expand All @@ -397,17 +399,17 @@ jobs:
python-version: ${{ matrix.python-version }}
install-dependencies: false
- name: '♻️ Cache pip cache folder'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.setup-poetry.outputs.pip-cache-dir }}
key: pip-cache-${{ runner.os }}-python-${{ matrix.python-version }}
- name: '📤 Restore Spotlight'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: renumics-spotlight-${{ needs.prepare-python.outputs.version }}
path: build/dist
- name: '📤 Restore datasets'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: datasets-${{ needs.prepare-python.outputs.version }}
path: build/datasets/
Expand Down Expand Up @@ -459,11 +461,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: '📤 Restore core Spotlight'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: renumics-spotlight-${{ needs.prepare-python.outputs.version }}
path: dist
Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
hooks:
- id: ruff
name: ruff
entry: poetry run ruff
entry: poetry run ruff check --fix --exit-non-zero-on-fix --show-fixes
language: system
types: [python]
require_serial: true
Expand All @@ -25,7 +25,7 @@ repos:

# "official" pre-commit hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
exclude: \.secret\.
Expand All @@ -42,22 +42,22 @@ repos:

# third-pary hooks
- repo: https://github.com/psf/black
rev: 23.1.0
rev: 24.1.1
hooks:
- id: black
- id: black-jupyter
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
rev: v3.1.0
hooks:
- id: prettier
exclude: (\.secret\.)|(pnpm-lock.yaml)
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.34.0
rev: v8.56.0
hooks:
- id: eslint
files: src
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.21.0
rev: 0.28.0
hooks:
- id: check-github-actions
- id: check-github-workflows
Expand All @@ -67,6 +67,6 @@ repos:
- id: shellcheck
- id: shfmt
- repo: https://github.com/kynan/nbstripout
rev: 0.6.1
rev: 0.7.1
hooks:
- id: nbstripout
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ typecheck: ## Typecheck all source files

.PHONY: lint
lint: ## Lint all source files
poetry run ruff renumics tests scripts/*.py
poetry run ruff check renumics tests scripts/*.py
pnpm run lint

TABLE_FILE ?= "data/tables/tallymarks-small.h5"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ We have added crash report and performance collection. We do NOT collect user da
## Learn more about unstructured data workflows

- 🤗 [Huggingface](https://huggingface.co/renumics) example spaces and datasets
- 🏀 [Playbook](https://renumics.com/docs/playbook/) for data-centric AI workflows
- 🏀 [Playbook](https://renumics.com/docs/data-centric-ai/playbook) for data-centric AI workflows
- 🍰 [Sliceguard](https://github.com/Renumics/sliceguard) library for automatic slice detection

## Contribute
Expand Down
Loading

0 comments on commit 9e5ba88

Please sign in to comment.