Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update aiidalab package #138

Merged
merged 5 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v2
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Install dependencies
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.10
uses: actions/setup-python@v2
- uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Install dependencies
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
"${GITHUB_WORKSPACE}/build.sh"
cp -r "${GITHUB_WORKSPACE}/build/" ${{ runner.temp }}/

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: 'gh-pages'

Expand Down
14 changes: 2 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,10 @@ ci:
autoupdate_schedule: quarterly

repos:
- repo: https://github.com/psf/black
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no python files in this repo.

rev: 24.3.0
hooks:
- id: black
language_version: python3 # Should be a command that runs python3.6+

- repo: https://github.com/PyCQA/flake8
rev: '7.0.0'
hooks:
- id: flake8
args: [--count, --show-source, --statistics]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v4.5.0'
rev: 'v4.6.0'
hooks:
- id: check-yaml
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simple check for the validity of yaml files

- id: pretty-format-json
args: [--autofix, --no-ensure-ascii, --indent=4, --top-keys, '$schema,$id,type,properties']
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# AiiDAlab Application Registry

This repository contains the **database** of the official App registry for [AiiDAlab](https://www.materialscloud.org/aiidalab).
This repository contains the **database** of the official App registry for [AiiDAlab](https://aiidalab.net).

<p align="center">
<a href="http://aiidalab.github.io/aiidalab-registry" rel="Go to AiiDAlab app registry">
Expand All @@ -10,7 +10,7 @@ This repository contains the **database** of the official App registry for [AiiD

## How to add an app to the registry

Simply propose a change to the [apps.yaml](https://github.com/aiidalab/aiidalab-registry/blob/master/apps.yaml) file in this repository and add an entry for your app, for example:
Propose a change to the [apps.yaml](https://github.com/aiidalab/aiidalab-registry/blob/master/apps.yaml) file in this repository and add an entry for your app, for example:

```yaml
hello-world:
Expand All @@ -23,7 +23,7 @@ Please see the [AiiDAlab documentation](https://aiidalab.readthedocs.io/en/lates

## Information for maintainers

To generate the website, simply execute the following script:
To generate the website, execute the following script:

```console
$ ./build.sh
Expand All @@ -47,10 +47,10 @@ To manually trigger the CI workflow to deploy the registry, go to the [Actions t

## Acknowledgements

This work is supported by the [MARVEL National Centre for Competency in Research](<http://nccr-marvel.ch>) funded by the [Swiss National Science Foundation](<http://www.snf.ch/en>),
This work is supported by the [MARVEL National Centre for Competency in Research](https://nccr-marvel.ch/) funded by the [Swiss National Science Foundation](https://www.snf.ch/en),
the MARKETPLACE project funded by [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) under the H2020-NMBP-25-2017 call (Grant No. 760173),
as well as by
the [MaX European Centre of Excellence](<http://www.max-centre.eu/>) funded by the Horizon 2020 EINFRA-5 program (Grant No. 676598).
the [MaX European Centre of Excellence](https://www.max-centre.eu/) funded by the Horizon 2020 EINFRA-5 program (Grant No. 676598).

<div style="text-align:center">
<img src="src/static/static/img/MARVEL.png" alt="MARVEL" height="100px">
Expand Down
5 changes: 2 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
aiidalab==23.3.1
pre-commit==3.6.0
packaging<22
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pin is part of aiidalab dependencies and so it is not needed here.

aiidalab[registry]==24.9.0
pre-commit>=3.6.0
6 changes: 0 additions & 6 deletions setup.cfg

This file was deleted.