Skip to content

Commit

Permalink
Merge branch 'master' into Add-Roadmap-meeting-to-events-page
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelfitzo authored Dec 18, 2024
2 parents d8ed896 + ce7c231 commit 9bef493
Show file tree
Hide file tree
Showing 113 changed files with 943 additions and 812 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/docs-ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: docs-ci
on:
push:
branches:
- master
- main
permissions:
contents: write
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Configure Git Credentials
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
- uses: actions/setup-python@v5
with:
python-version: 3.x
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
- uses: actions/cache@v4
with:
key: mkdocs-material-${{ env.cache_id }}
path: .cache
restore-keys: |
mkdocs-material-
- run: pip install mkdocs-material mkdocs-encryptcontent-plugin mkdocs-video
- run: cd gen3 && mkdocs gh-deploy --force
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ themes_used
*.DS_Store
./resources/
*/_gen/
.idea
.idea
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: detect-secrets
args: ['--baseline', '.secrets.baseline']
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.5.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand Down
94 changes: 7 additions & 87 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,13 @@
"line_number": 96
}
],
"gen3/docs/gen3-resources/operator-guide/helm/helm-config-auth.md": [
"gen3/docs/gen3-resources/operator-guide/helm/helm-config/helm-config-auth.md": [
{
"type": "Secret Keyword",
"filename": "gen3/docs/gen3-resources/operator-guide/helm/helm-config-auth.md",
"filename": "gen3/docs/gen3-resources/operator-guide/helm/helm-config/helm-config-auth.md",
"hashed_secret": "64ab0c1d3edc1c8c166351207b840ac7b2a90523",
"is_verified": false,
"line_number": 82
"line_number": 38
}
],
"gen3/docs/gen3-resources/operator-guide/helm/helm-deploy-example.md": [
Expand Down Expand Up @@ -368,7 +368,7 @@
"filename": "gen3/docs/gen3-resources/user-guide/analyze-data.md",
"hashed_secret": "98fd178574fc77b708149e559bf75052cc3c81a6",
"is_verified": false,
"line_number": 215
"line_number": 227
}
],
"gen3/docs/gen3-resources/user-guide/notebooks/notebook2_canine.ipynb": [
Expand Down Expand Up @@ -500,96 +500,16 @@
"filename": "gen3/docs/gen3-resources/user-guide/search.md",
"hashed_secret": "13333fbf17a0b71d02dda8e6e5c195263bfe03d6",
"is_verified": false,
"line_number": 138
"line_number": 146
},
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/gen3-resources/user-guide/search.md",
"hashed_secret": "8595e69444146fbf187e8c512b6fdc66f8da1d23",
"is_verified": false,
"line_number": 162
}
],
"gen3/docs/resources/user-guide/analyze-data.md": [
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/analyze-data.md",
"hashed_secret": "98fd178574fc77b708149e559bf75052cc3c81a6",
"is_verified": false,
"line_number": 228
}
],
"gen3/docs/resources/user-guide/img/analyze-data.md": [
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/img/analyze-data.md",
"hashed_secret": "98fd178574fc77b708149e559bf75052cc3c81a6",
"is_verified": false,
"line_number": 255
}
],
"gen3/docs/resources/user-guide/img/gen3-client.md": [
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/img/gen3-client.md",
"hashed_secret": "98cf839d65cf07eebc6c05bb7195e0266afc01db",
"is_verified": false,
"line_number": 398
},
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/img/gen3-client.md",
"hashed_secret": "e70fbe21d0e764d51e4d70021616e46f13661efe",
"is_verified": false,
"line_number": 399
},
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/img/gen3-client.md",
"hashed_secret": "9a85ba1c1deb9374d089b5e0ec2b29ebb82b0b5f",
"is_verified": false,
"line_number": 400
},
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/img/gen3-client.md",
"hashed_secret": "df6c17e3e41c4a2971823e110a7ee702288f574c",
"is_verified": false,
"line_number": 401
}
],
"gen3/docs/resources/user-guide/img/query-data.md": [
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/img/query-data.md",
"hashed_secret": "13333fbf17a0b71d02dda8e6e5c195263bfe03d6",
"is_verified": false,
"line_number": 87
},
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/img/query-data.md",
"hashed_secret": "8595e69444146fbf187e8c512b6fdc66f8da1d23",
"is_verified": false,
"line_number": 111
}
],
"gen3/docs/resources/user-guide/query-data.md": [
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/query-data.md",
"hashed_secret": "13333fbf17a0b71d02dda8e6e5c195263bfe03d6",
"is_verified": false,
"line_number": 75
},
{
"type": "Hex High Entropy String",
"filename": "gen3/docs/resources/user-guide/query-data.md",
"hashed_secret": "8595e69444146fbf187e8c512b6fdc66f8da1d23",
"is_verified": false,
"line_number": 99
"line_number": 170
}
]
},
"generated_at": "2024-11-18T20:09:19Z"
"generated_at": "2024-12-09T16:54:41Z"
}
1 change: 0 additions & 1 deletion archetypes/default.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ title: "{{ replace .Name "-" " " | title }}"
date: {{ .Date }}
draft: true
---

4 changes: 2 additions & 2 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ params:
link: /resources/user/analyze-data/#1-launch-workspace
- name: Getting Files into the Gen3 Workspace
link: /resources/user/analyze-data/#2-getting-files-into-the-gen3-workspace
- name: Working with the proxy and whitelists
link: /resources/user/analyze-data/#3-working-with-the-proxy-and-whitelists
- name: Working with the proxy and allow lists
link: /resources/user/analyze-data/#3-working-with-the-proxy-and-allow-lists
- name: Using the Gen3 Python SDK
link: /resources/user/analyze-data/#4-using-the-gen3-python-sdk
- name: Jupyter Notebook Demos
Expand Down
2 changes: 1 addition & 1 deletion content/community/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ g3past:
Slides: Gen3 Forum September 6 2023 - Security and Compliance.pdf
- Title: Data Modeling in Gen3 Data Commons
Date: July 6, 2023, 3:30-5:00 pm CDT; July 7, 2023, 6:30-8:00 am AEST
Description: Gen3 supports a flexible graph-based data model, which can be customized for a wide variety of projects and use cases. At this community event we will hear from several data commons operators on how they have created their dictionaries and about any tools or processes they use for updating and configuring them.
Description: Gen3 supports a flexible graph-based data model, which can be customized for a wide variety of projects and use cases. At this community event we will hear from several data commons operators on how they have created their dictionaries and about any tools or processes they use for updating and configuring them.
Agenda2: /community/events/gen3forum_20230706
Youtube: xjFUYa4C_hw
Slides: Gen3 Forum July 6 2023 - Data Models.pdf
Expand Down
1 change: 0 additions & 1 deletion content/community/medium.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ linktitle: /community/medium
date: 2018-09-04T22:16:21-05:00
draft: true
---

2 changes: 1 addition & 1 deletion content/community/webinars/coming_soon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion content/figs/BioTeam-Logo_2021.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9bef493

Please sign in to comment.