Skip to content

Commit

Permalink
Merge branch 'master' into index-meta-fields
Browse files Browse the repository at this point in the history
  • Loading branch information
sir-sigurd authored Oct 13, 2023
2 parents ba293aa + 2cb6984 commit 918a561
Show file tree
Hide file tree
Showing 49 changed files with 206 additions and 237 deletions.
7 changes: 0 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ updates:
directory: "/catalog"
schedule:
interval: "daily"
ignore:
- dependency-name: "nginx"
# Prefer stable over mainline. See
# https://www.nginx.com/blog/nginx-1-6-1-7-released/ for explanation.
# There is no way to specify stable versions, so just ignore latest
# mainline.
versions: ["~> 1.25.0"]

- package-ecosystem: "docker"
directory: "/s3-proxy"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/js-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
env:
NODE_OPTIONS: --max-old-space-size=4096
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: '16.11'
Expand All @@ -39,7 +39,7 @@ jobs:
env:
NODE_OPTIONS: --max-old-space-size=4096
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: '16.11'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/py-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.7'
Expand All @@ -28,7 +28,7 @@ jobs:
isort:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.7'
Expand All @@ -45,7 +45,7 @@ jobs:
env:
QUILT_DISABLE_USAGE_METRICS: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.7'
Expand All @@ -65,7 +65,7 @@ jobs:
env:
QUILT_DISABLE_USAGE_METRICS: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand All @@ -85,7 +85,7 @@ jobs:
env:
QUILT_DISABLE_USAGE_METRICS: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
run:
working-directory: api/python
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.7'
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
PYTHONPATH: deps
JUPYTER_PATH: deps/share/jupyter # Jupyter is not smart enough to handle custom Python paths
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
Expand Down
17 changes: 16 additions & 1 deletion catalog/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
FROM nginx:1.24.0@sha256:a195f9fb6503531660b25f9aeefef1f48bbaf56f46da04bffe1568abb3d3aff6
FROM amazonlinux:2023.2.20231011.0
MAINTAINER Quilt Data, Inc. [email protected]

ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8

# Upgrade and install dependencies
# gettext is required by envsubst
RUN dnf -y upgrade && dnf -y install gettext nginx && dnf -y clean all

# Make logs show up in Docker output
RUN ln -sf /dev/stdout /var/log/nginx/access.log && \
ln -sf /dev/stderr /var/log/nginx/error.log

# Set up nginx
COPY nginx.conf /etc/nginx/nginx.conf
COPY nginx-web.conf /etc/nginx/conf.d/default.conf

# Copy pre-built catalog assets to nginx
Expand All @@ -11,6 +23,9 @@ COPY build /usr/share/nginx/html
# Copy config file
COPY config.json.tmpl config.json.tmpl

# Use SIGQUIT for a "graceful" shutdown
STOPSIGNAL SIGQUIT

# Substitute environment variables into config.json and generate config.js based on that before starting nginx.
# Note: use "exec" because otherwise the shell will catch Ctrl-C and other signals.
CMD envsubst < config.json.tmpl > /usr/share/nginx/html/config.json \
Expand Down
1 change: 1 addition & 0 deletions catalog/app/components/Markdown/Markdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const SANITIZE_OPTS = {
'aside',
'b',
'blockquote',
'br',
'caption',
'code',
'col',
Expand Down
2 changes: 1 addition & 1 deletion catalog/app/components/Preview/loaders/Notebook.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const Loader = function WrappedNotebookLoader({
children,
}: NotebookLoaderProps) {
return (
<React.Suspense fallback={() => children(AsyncResult.Pending())}>
<React.Suspense fallback={<>{children(AsyncResult.Pending())}</>}>
<NotebookLoader {...{ handle, children }} />
</React.Suspense>
)
Expand Down
6 changes: 3 additions & 3 deletions catalog/app/website/pages/AwsMarketplace/CaseStudies.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import cx from 'classnames'
import * as React from 'react'
import * as M from '@material-ui/core'

import logoCelsius from './logo-celsius.png'
import logoResilience from './logo-resilience.svg'
import logoTessera from './logo-tessera.png'
import logoCelsius from 'website/pages/Landing/Logos/logo-celsius.png'
import logoResilience from 'website/pages/Landing/Logos/logo-resilience.svg'
import logoTessera from 'website/pages/Landing/Logos/logo-tessera.png'

const useCaseStudyStyles = M.makeStyles((t) => ({
logo: {
Expand Down
53 changes: 1 addition & 52 deletions catalog/app/website/pages/AwsMarketplace/Partners.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,7 @@ import * as React from 'react'
import * as M from '@material-ui/core'

import LogosCarousel from 'website/pages/Landing/LogosCarousel'

import logoAllencell from 'website/pages/Landing/Logos/logo-allencell.png'
import logoCelsius from 'website/pages/Landing/Logos/logo-celsius.png'
import logoNeumora from 'website/pages/Landing/Logos/logo-neumora.png'
import logoObsidian from 'website/pages/Landing/Logos/logo-obsidian.png'
import logoStemson from 'website/pages/Landing/Logos/logo-stemson.png'
import logoVir from 'website/pages/Landing/Logos/logo-vir.png'

import logoTessera from './logo-tessera.png'
import logoResilience from './logo-resilience.svg'
import logoDspconcepts from './logo-dspconcepts.svg'

const logos = [
{
src: logoTessera,
title: 'Tessera',
// width: '240px',
},
{
src: logoResilience,
title: 'Resilience',
width: '240px',
},
{
src: logoDspconcepts,
title: 'DSP Concepts',
},
{
src: logoCelsius,
title: 'Celsius Therapeutics',
},
{
src: logoVir,
title: 'Vir Bio',
},
{
src: logoNeumora,
title: 'Neumora Therapeutics',
},
{
src: logoObsidian,
title: 'Obsidian Therapeutics',
},
{
src: logoStemson,
title: 'Stemson Therapeutics',
},
{
src: logoAllencell,
title: 'Allen Institute for Cell Science',
},
]
import logos from 'website/pages/Landing/Logos/list'

const useStyles = M.makeStyles({
root: {
Expand Down
Binary file not shown.
33 changes: 1 addition & 32 deletions catalog/app/website/pages/BioIT.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,14 @@ import Layout from 'website/components/Layout'
import Lede from 'website/components/Lede'
import Section from 'website/components/Section'
import Tabs from 'website/components/Tabs'
import logos from 'website/pages/Landing/Logos/list'

import imageArch from 'website/pages/Landing/Assets/quilt-architecture.png'
import logoAllencell from 'website/pages/Landing/Logos/logo-allencell.png'
import logoCelsius from 'website/pages/Landing/Logos/logo-celsius.png'
import logoNeumora from 'website/pages/Landing/Logos/logo-neumora.png'
import logoObsidian from 'website/pages/Landing/Logos/logo-obsidian.png'
import logoStemson from 'website/pages/Landing/Logos/logo-stemson.png'
import logoVir from 'website/pages/Landing/Logos/logo-vir.png'

const SALES_ADDRESS = 'mailto:[email protected]'
const DECK_URL =
'https://quilt-web-public.s3.amazonaws.com/deck/Quilt%E2%80%94the+data+hub+for+biotech.pdf'

const logos = [
{
src: logoCelsius,
title: 'Celsius Therapeutics',
},
{
src: logoVir,
title: 'Vir Bio',
},
{
src: logoNeumora,
title: 'Neumora Therapeutics',
},
{
src: logoObsidian,
title: 'Obsidian Therapeutics',
},
{
src: logoStemson,
title: 'Stemson Therapeutics',
},
{
src: logoAllencell,
title: 'Allen Institute for Cell Science',
},
]
const useVideoStyles = M.makeStyles({
wrapper: {
maxWidth: '900px',
Expand Down
39 changes: 1 addition & 38 deletions catalog/app/website/pages/Landing/Logos/Logos.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,7 @@ import * as React from 'react'

import LogosCarousel from 'website/pages/Landing/LogosCarousel'

import logoCelsius from './logo-celsius.png'
import logoHudl from './logo-hudl.png'
import logoNeumora from './logo-neumora.png'
import logoObsidian from './logo-obsidian.png'
import logoSight from './logo-sight.png'
import logoStemson from './logo-stemson.png'
import logoVir from './logo-vir.png'

const logos = [
{
src: logoCelsius,
title: 'Celsius Therapeutics',
},
{
src: logoVir,
title: 'Vir Bio',
},
{
src: logoNeumora,
title: 'Neumora Therapeutics',
},
{
src: logoObsidian,
title: 'Obsidian Therapeutics',
},
{
src: logoStemson,
title: 'Stemson Therapeutics',
},
{
src: logoHudl,
title: 'hudl',
},
{
src: logoSight,
title: 'Sighthound',
},
]
import logos from './list'

export default function Logos() {
return <LogosCarousel logos={logos} title="Companies that love Quilt" />
Expand Down
44 changes: 44 additions & 0 deletions catalog/app/website/pages/Landing/Logos/list.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import logoAllencell from './logo-allencell.png'
import logoDecibel from './logo-decibel.png'
import logoDspconcepts from './logo-dspconcepts.svg'
import logoHudl from './logo-hudl.png'
import logoInari from './logo-inari.svg'
import logoNeumora from './logo-neumora.png'
import logoResilience from './logo-resilience.svg'
import logoTessera from './logo-tessera.png'

export default [
{
src: logoDecibel,
title: 'Decibel Therapeutics',
},
{
src: logoNeumora,
title: 'Neumora Therapeutics',
},
{
src: logoResilience,
title: 'Resilience',
width: '240px',
},
{
src: logoInari,
title: 'Inari',
},
{
src: logoHudl,
title: 'hudl',
},
{
src: logoTessera,
title: 'Tessera',
},
{
src: logoDspconcepts,
title: 'DSP Concepts',
},
{
src: logoAllencell,
title: 'Allen Institute for Cell Science',
},
]
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions catalog/app/website/pages/Landing/Logos/logo-inari.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed catalog/app/website/pages/Landing/Logos/logo-vir.png
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 918a561

Please sign in to comment.