Skip to content

Commit

Permalink
Merge branch 'master' into search-results-number-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
sir-sigurd authored Nov 21, 2024
2 parents b102975 + 7134f13 commit a2e09f8
Show file tree
Hide file tree
Showing 337 changed files with 21,014 additions and 7,016 deletions.
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- [ ] Automated tests (e.g. Preflight)
- [ ] Confirm that this change meets security best practices and does not violate the security model
- [ ] Documentation
- [ ] run `optipng` on any new PNGs
- [ ] [Python: Run `build.py`](../tree/master/gendocs/build.py) for new docstrings
- [ ] JavaScript: basic explanation and screenshot of new features
- [ ] Markdown somewhere in docs/**/*.md that explains the feature to end users (said .md files should be linked from SUMMARY.md so they appear on https://docs.quiltdata.com)
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-lambdas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ jobs:
- indexer
- pkgevents
- pkgpush
- pkgselect
- preview
- s3hash
- s3select
- status_reports
- tabular_preview
- transcode
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/js-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,11 @@ jobs:
name: ${{ github.job }}
lint-docs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: docs
env:
NODE_OPTIONS: --max-old-space-size=4096
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: 'catalog/package.json'
- run: npx --package=markdownlint-cli markdownlint --ignore node_modules **/*.md
- run: npx --package=markdownlint-cli markdownlint .
18 changes: 8 additions & 10 deletions .github/workflows/py-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
Expand All @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
python-version: ['3.9', '3.10', '3.11', '3.12']
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
runs-on: ${{ matrix.os }}
env:
QUILT_DISABLE_USAGE_METRICS: true
Expand Down Expand Up @@ -133,15 +133,15 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.12'
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
python -m pip install build==1.2.2.post1 twine==5.1.1
- name: verify git tag vs. version
env:
CIRCLE_TAG: ${{ github.ref_name }}
run: python setup.py verify
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
python -m pip install build==0.8.0 twine==4.0.0
- name: build
run: python -m build
- name: upload to PyPI
Expand All @@ -160,10 +160,8 @@ jobs:
- molecule
- pkgevents
- pkgpush
- pkgselect
- preview
- s3hash
- s3select
- shared
- status_reports
- tabular_preview
Expand Down
7 changes: 7 additions & 0 deletions .markdownlint.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"default": true,
"no-blanks-blockquote": false,
"no-duplicate-heading": {
"siblings_only": true
}
}
10 changes: 10 additions & 0 deletions .markdownlintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Not ready for lint yet
gendocs
testdocs

# Autogenerated
docs/api-reference

.git
catalog/node_modules
venv
54 changes: 54 additions & 0 deletions api/python/quilt3-admin/queries.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ fragment OperationErrorSelection on OperationError {
name
context
}
fragment SsoConfigSelection on SsoConfig {
text
timestamp
uploader {
...UserSelection
}
}

query rolesList {
roles {
Expand Down Expand Up @@ -187,3 +194,50 @@ mutation usersRemoveRoles($name: String!, $roles: [String!]!, $fallback: String)
}
}
}

query ssoConfigGet {
admin {
ssoConfig {
...SsoConfigSelection
}
}
}

mutation ssoConfigSet($config: String) {
admin {
setSsoConfig(config: $config) {
...SsoConfigSelection
...InvalidInputSelection
...OperationErrorSelection
}
}
}

query bucketTabulatorTablesList($name: String!) {
bucketConfig(name: $name) {
tabulatorTables {
name
config
}
}
}

mutation bucketTabulatorTableSet($bucketName: String!, $tableName: String!, $config: String) {
admin {
bucketSetTabulatorTable(bucketName: $bucketName, tableName: $tableName, config: $config) {
__typename
...InvalidInputSelection
...OperationErrorSelection
}
}
}

mutation bucketTabulatorTableRename($bucketName: String!, $tableName: String!, $newTableName: String!) {
admin {
bucketRenameTabulatorTable(bucketName: $bucketName, tableName: $tableName, newTableName: $newTableName) {
__typename
...InvalidInputSelection
...OperationErrorSelection
}
}
}
2 changes: 1 addition & 1 deletion api/python/quilt3/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.0a5
6.1.0
2 changes: 1 addition & 1 deletion api/python/quilt3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
from .bucket import Bucket
from .imports import start_data_package_loader
from .packages import Package
from .session import logged_in, login, logout
from .session import get_boto3_session, logged_in, login, logout

start_data_package_loader()
12 changes: 8 additions & 4 deletions api/python/quilt3/admin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
APIs for Quilt administrators. 'Registry' refers to Quilt stack backend services, including identity management.
"""

# This wraps code generated by aridne-codegen to provide a more user-friendly API.
# This wraps code generated by ariadne-codegen to provide a more user-friendly API.

from . import roles, users
from .exceptions import Quilt3AdminError, UserNotFoundError
from .types import ManagedRole, UnmanagedRole, User
from . import roles, sso_config, tabulator, users
from .exceptions import (
BucketNotFoundError,
Quilt3AdminError,
UserNotFoundError,
)
from .types import ManagedRole, SSOConfig, TabulatorTable, UnmanagedRole, User
52 changes: 52 additions & 0 deletions api/python/quilt3/admin/_graphql_client/__init__.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a2e09f8

Please sign in to comment.