Skip to content

Commit bae9914

Browse files
authored
Merge pull request #148 from pyiron/towards_main
Rename master to main
2 parents a5741a8 + be7f874 commit bae9914

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
exclude:
2-
- master
2+
- main
33
delete_closed_pr: false

.github/workflows/UpdateDependabotPR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: UpdateDependabotPR
22

33
on:
44
pull_request_target:
5-
branches: [ master ]
5+
branches: [ main ]
66

77
jobs:
88
build:

.github/workflows/black.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Black
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master ]
10+
branches: [ main ]
1111

1212
jobs:
1313
build:

.github/workflows/pypicheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: Pip check
44

55
on:
66
push:
7-
branches: [ master ]
7+
branches: [ main ]
88
pull_request:
9-
branches: [ master ]
9+
branches: [ main ]
1010

1111
jobs:
1212
build:

.github/workflows/unittest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Unittests
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master ]
10+
branches: [ main ]
1111

1212
env:
1313
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Simple queue adapter for python
33

44
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/9db80cb2477f46be870d1446540b4bf3)](https://www.codacy.com/app/pyiron-runner/pysqa?utm_source=github.com&utm_medium=referral&utm_content=pyiron/pysqa&utm_campaign=Badge_Grade_Dashboard)
55
[![Python package](https://github.com/pyiron/pysqa/workflows/Python%20package/badge.svg)](https://github.com/pyiron/pysqa/actions)
6-
[![Coverage Status](https://coveralls.io/repos/github/pyiron/pysqa/badge.svg?branch=master)](https://coveralls.io/github/pyiron/pysqa?branch=master)
6+
[![Coverage Status](https://coveralls.io/repos/github/pyiron/pysqa/badge.svg?branch=main)](https://coveralls.io/github/pyiron/pysqa?branch=main)
77

88
The goal of pysqa is to make submitting to an HPC cluster as easy as starting another subprocess. This is based on the assumption that even though modern queuing systems allow for an wide range of different configuration, most users submit the majority of their jobs with very similar parameters. Therefore pysqa allows the users to store their submission scripts as jinja2 templates for quick access. After the submission pysqa allows the users to track the progress of their jobs, delete them or enable reservations using the built-in functionality of the queuing system. The currently supported queuing systems are: LFS, MOAB, SGE (tested), SLURM (tested), TORQUE.
99

@@ -19,7 +19,7 @@ Or via anaconda from the conda-forge channel
1919

2020
# Usage
2121
pysqa requires the user to configure the type of queuing system as well as the available templates. Example configuration are available at:
22-
https://github.com/pyiron/pysqa/tree/master/tests/config
22+
https://github.com/pyiron/pysqa/tree/main/tests/config
2323
By default pysqa is searching for the queue configuration in `~/.queues/queue.yaml` and the corresponding jinja2 templates in the same folder.
2424

2525
Import pysqa:
@@ -53,14 +53,14 @@ Delete a job from the queuing sytem:
5353

5454
Sample configurations for the specific queuing systems are availabe in the tests:
5555

56-
* lsf - https://github.com/pyiron/pysqa/tree/master/tests/config/lsf
57-
* moab - https://github.com/pyiron/pysqa/tree/master/tests/config/moab
58-
* SGE - https://github.com/pyiron/pysqa/tree/master/tests/config/sge
59-
* slurm - https://github.com/pyiron/pysqa/tree/master/tests/config/slurm
60-
* torque - https://github.com/pyiron/pysqa/tree/master/tests/config/torque
56+
* lsf - https://github.com/pyiron/pysqa/tree/main/tests/config/lsf
57+
* moab - https://github.com/pyiron/pysqa/tree/main/tests/config/moab
58+
* SGE - https://github.com/pyiron/pysqa/tree/main/tests/config/sge
59+
* slurm - https://github.com/pyiron/pysqa/tree/main/tests/config/slurm
60+
* torque - https://github.com/pyiron/pysqa/tree/main/tests/config/torque
6161

6262
# License
63-
pysqa is released under the BSD license https://github.com/pyiron/pysqa/blob/master/LICENSE . It is a spin-off of the pyiron project https://github.com/pyiron/pyiron therefore if you use pysqa for your publication, please cite:
63+
pysqa is released under the BSD license https://github.com/pyiron/pysqa/blob/main/LICENSE . It is a spin-off of the pyiron project https://github.com/pyiron/pyiron therefore if you use pysqa for your publication, please cite:
6464

6565
@article{pyiron-paper,
6666
title = {pyiron: An integrated development environment for computational materials science},

0 commit comments

Comments
 (0)