Skip to content

Commit

Permalink
Merge branch 'master' into add_molecules_to_atom_data
Browse files Browse the repository at this point in the history
  • Loading branch information
jvshields authored Aug 20, 2024
2 parents 0cc4060 + 5fe6806 commit 8243bad
Show file tree
Hide file tree
Showing 52 changed files with 2,230 additions and 1,836 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
if: github.event_name == 'push'
with:
fetch-depth: 0

- name: Checkout PR and master branch
if: github.event_name == 'pull_request_target'
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v5
Expand Down
116 changes: 116 additions & 0 deletions .github/workflows/tardis-research-papers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
name: tardis-research-papers

on:
schedule:
- cron: "0 0 1 * *"
workflow_dispatch:

defaults:
run:
shell: bash -l {0}

env:
NASA_ADS_TOKEN: ${{ secrets.NASA_ADS_TOKEN }}

jobs:
research-using-tardis:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup micromamba
uses: mamba-org/setup-micromamba@v1
with:
environment-name: fetch-env
create-args: >-
python=3.10
jupyter
- name: Run the ADS notebook
run: |
jupyter nbconvert --to python docs/resources/research_done_using_TARDIS/ads.ipynb
python3 docs/resources/research_done_using_TARDIS/ads.py
- uses: actions/upload-artifact@v4
with:
name: research_papers
path: |
resource_papers.rst
pull_request:
needs: [research-using-tardis]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/download-artifact@v4
with:
path: /tmp

- name: Copy files to repository
run: |
ls -l /tmp
cp -r /tmp/research_papers/* docs/resources/research_done_using_TARDIS/
- name: Get current date
run: echo "DATE=$(date +'%Y.%m.%d')" >> $GITHUB_ENV

- uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.BOT_TOKEN }}
committer: TARDIS Bot <tardis.sn.bot@gmail.com>
author: TARDIS Bot <tardis.sn.bot@gmail.com>
branch: TARDIS-research-papers-${{ env.DATE }}
base: master
push-to-fork: tardis-bot/tardis
commit-message: Automated changes for TARDIS-research-papers ${{ env.DATE }}
title: TARDIS-research-papers ${{ env.DATE }}
body: |
*\*beep\* \*bop\**
Hi, human.

> This pull request contains the latest updates to the research papers that utilize the TARDIS.

> This pull request should be auto-merged.
labels: automated, build-docs
team-reviewers: tardis-infrastructure
id: create-pr

- name: Wait for pull request
run: sleep 30

- name: Approve pull request (I)
run: gh pr review ${{ steps.create-pr.outputs.pull-request-number }} --approve
env:
GITHUB_TOKEN: ${{ secrets.INFRASTRUCTURE_COORDINATOR_TOKEN }}
if: steps.create-pr.outputs.pull-request-operation == 'created'

- name: Approve pull request (II)
run: gh pr review ${{ steps.create-pr.outputs.pull-request-number }} --approve
env:
GITHUB_TOKEN: ${{ secrets.CORE_COORDINATOR_TOKEN }}
if: steps.create-pr.outputs.pull-request-operation == 'created'

- name: Enable automerge
uses: peter-evans/enable-pull-request-automerge@v2
with:
token: ${{ secrets.INFRASTRUCTURE_COORDINATOR_TOKEN }}
pull-request-number: ${{ steps.create-pr.outputs.pull-request-number }}
merge-method: squash
if: steps.create-pr.outputs.pull-request-operation == 'created'

dispatch-to-tardis-website:
name: Dispatch to Tardis Website
runs-on: ubuntu-latest
needs: [research-using-tardis]
if: github.repository_owner == 'tardis-sn'
steps:
- name: Dispatch to Tardis-org-data
run: |
curl -X POST \
-H "Authorization: Bearer ${{ secrets.BOT_TOKEN }}" \
-H "Accept: application/vnd.github+json" \
-H "Content-Type: application/json" \
-d '{ "event_type": "fetch-papers" }' \
https://api.github.com/repos/tardis-sn/tardis-org-data/dispatches
49 changes: 26 additions & 23 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@
"name": "Patel, Maryam"
},
{
"name": "Varanasi, Kaushik"
"name": "Rathi, Shikha"
},
{
"name": "Rathi, Shikha"
"name": "Varanasi, Kaushik"
},
{
"name": "Chitchyan, Sona"
Expand All @@ -145,13 +145,13 @@
"affiliation": "University of Oxford"
},
{
"name": "Singh, Shreyas"
"name": "Shields, Josh"
},
{
"name": "Savel, Arjun"
"name": "Singh, Shreyas"
},
{
"name": "Eweis, Youssef"
"name": "Savel, Arjun"
},
{
"name": "Reinecke, Martin"
Expand All @@ -160,17 +160,23 @@
"name": "Holas, Alexander"
},
{
"name": "Bylund, Tomas"
"name": "Eweis, Youssef"
},
{
"name": "Gupta, Sumit"
},
{
"name": "Bentil, Laud"
"name": "Bylund, Tomas"
},
{
"name": "Black, William"
},
{
"name": "Bentil, Laud"
},
{
"name": "Kumar, Asish"
},
{
"name": "Eguren, Jordi",
"orcid": "0000-0002-2328-8030"
Expand All @@ -181,9 +187,6 @@
{
"name": "Bartnik, Matthew"
},
{
"name": "Kumar, Asish"
},
{
"name": "Alam, Arib"
},
Expand All @@ -197,10 +200,7 @@
"name": "Varma Buddaraju, Rohith"
},
{
"name": "Kambham, Satwik"
},
{
"name": "Lu, Jing"
"name": "Srivastava, Sarthak"
},
{
"name": "Visser, Erin"
Expand All @@ -209,42 +209,45 @@
"name": "Daksh, Ayushi"
},
{
"name": "Livneh, Ran"
"name": "Lu, Jing"
},
{
"name": "Srivastava, Sarthak"
"name": "Livneh, Ran"
},
{
"name": "Rajagopalan, Srinath"
"name": "Kambham, Satwik"
},
{
"name": "Bhakar, Jayant"
"name": "Roldan, Israel"
},
{
"name": "Roldan, Israel"
"name": "Bhakar, Jayant"
},
{
"name": "Mishra, Sashank",
"orcid": "0000-0001-8302-1584"
},
{
"name": "Jain, Rinkle"
"name": "Rajagopalan, Srinath"
},
{
"name": "Floers, Andreas"
"name": "Reichenbach, John"
},
{
"name": "Reichenbach, John"
"name": "Jain, Rinkle"
},
{
"name": "Actions, GitHub"
},
{
"name": "Chaumal, Aarya"
"name": "Floers, Andreas"
},
{
"name": "Gupta, Harshul"
},
{
"name": "Chaumal, Aarya"
},
{
"name": "Brar, Antreev"
},
Expand Down
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
## Changelog

### release-2024.08.18 (2024/08/17 20:45)
- [2802](https://github.com/tardis-sn/tardis/pull/2802) Pre-release 2024.08.18 (2802) (@tardis-bot)
- [2788](https://github.com/tardis-sn/tardis/pull/2788) Update benchmark base (2788) (@officialasishkumar)
- [2785](https://github.com/tardis-sn/tardis/pull/2785) Convert SDEC tests to Regression Data (2785) (@atharva-2001)
- [2799](https://github.com/tardis-sn/tardis/pull/2799) Remove syrupy section from docs (2799) (@KasukabeDefenceForce)
- [2801](https://github.com/tardis-sn/tardis/pull/2801) Fix file formats (2801) (@andrewfullard)
- [2784](https://github.com/tardis-sn/tardis/pull/2784) Add Packet Wavelength filter to LIV Plot (2784) (@sarthak-dv)
- [2786](https://github.com/tardis-sn/tardis/pull/2786) Macroatom restructure (2786) (@Rodot-)
- [2748](https://github.com/tardis-sn/tardis/pull/2748) [restructure/plasma] Cleanup plasma assembly (2748) (@wkerzendorf)
- [2736](https://github.com/tardis-sn/tardis/pull/2736) Track boundary interaction (2736) (@Sumit112192)
- [2782](https://github.com/tardis-sn/tardis/pull/2782) Change parameters in benchmarks (2782) (@officialasishkumar)
- [2790](https://github.com/tardis-sn/tardis/pull/2790) Post-release 2024.08.12 (2790) (@tardis-bot)
### release-2024.08.12 (2024/08/12 08:57)
- [2789](https://github.com/tardis-sn/tardis/pull/2789) Pre-release 2024.08.11 (2789) (@tardis-bot)
- [2759](https://github.com/tardis-sn/tardis/pull/2759) Minor refactor of the spectrum solver (2759) (@andrewfullard)
Expand Down Expand Up @@ -51,7 +63,7 @@
- [2711](https://github.com/tardis-sn/tardis/pull/2711) Shifting git cliff changelog generator configuration to pyproject.toml (2711) (@KasukabeDefenceForce)
- [2713](https://github.com/tardis-sn/tardis/pull/2713) Move pip tests to release workflow (2713) (@atharva-2001)
- [2699](https://github.com/tardis-sn/tardis/pull/2699) Separate Continuum Tests (2699) (@atharva-2001)
- [2677](https://github.com/tardis-sn/tardis/pull/2677) Last Interaction Velocity Plot (2677) (@sarthak-dv)
- [2677](https://github.com/tardis-sn/tardis/pull/2677) Last Interaction Velocity (2677) (@sarthak-dv)
- [2705](https://github.com/tardis-sn/tardis/pull/2705) Montecarlo globals (limited scope) (2705) (@andrewfullard)
- [2703](https://github.com/tardis-sn/tardis/pull/2703) Pre Release Fix (2703) (@atharva-2001)
- [2704](https://github.com/tardis-sn/tardis/pull/2704) Shifting update refdata workflow to archive folder (2704) (@KasukabeDefenceForce)
Expand Down
Loading

0 comments on commit 8243bad

Please sign in to comment.