Skip to content

Commit

Permalink
Espenhgn/issue17 (#20)
Browse files Browse the repository at this point in the history
* Migrate to precimed GH organization
Fixes #17
  • Loading branch information
espenhgn authored Oct 18, 2022
1 parent ef67857 commit d446e43
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Changes proposed in this pull request:
## Before submitting

<!-- Please complete this checklist BEFORE submitting your PR to speed along the review process. -->
- [ ] I've read and followed all steps in the [Making a pull request](https://github.com/comorment/containers/blob/main/CONTRIBUTING.md#making-a-pull-request)
- [ ] I've read and followed all steps in the [Making a pull request](https://github.com/precimed/container_template/blob/main/CONTRIBUTING.md#making-a-pull-request)
section of the `CONTRIBUTING` docs.
- [ ] I've updated or added any relevant docstrings following the syntax described in the
[Writing docstrings](https://github.com/comorment/containers/blob/main/CONTRIBUTING.md#writing-docstrings) section of the `CONTRIBUTING` docs.
[Writing docstrings](https://github.com/precimed/container_template/blob/main/CONTRIBUTING.md#writing-docstrings) section of the `CONTRIBUTING` docs.
- [ ] If this PR fixes a bug, I've added a test that will fail without my fix.
- [ ] If this PR adds a new feature, I've added tests that sufficiently cover my new functionality.
24 changes: 12 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Thanks for considering contributing! Please read this document to learn the vari

### Did you find a bug?

First, do [a quick search](https://github.com/espenhgn/container_template/issues) to see whether your issue has already been reported.
First, do [a quick search](https://github.com/precimed/container_template/issues) to see whether your issue has already been reported.
If your issue has already been reported, please comment on the existing issue.

Otherwise, open [a new GitHub issue](https://github.com/espenhgn/container_template/issues). Be sure to include a clear title
Otherwise, open [a new GitHub issue](https://github.com/precimed/container_template/issues). Be sure to include a clear title
and description. The description should include as much relevant information as possible. The description should
explain how to reproduce the erroneous behavior as well as the behavior you expect to see. Ideally you would include a
code sample or an executable test case demonstrating the expected behavior.
Expand All @@ -21,7 +21,7 @@ We use GitHub issues to track feature requests. Before you create a feature requ
* Make sure you have a clear idea of the enhancement you would like. If you have a vague idea, consider discussing
it first on a GitHub issue.
* Check the documentation to make sure your feature does not already exist.
* Do [a quick search](https://github.com/espenhgn/container_template/issues) to see whether your feature has already been suggested.
* Do [a quick search](https://github.com/precimed/container_template/issues) to see whether your feature has already been suggested.

When creating your request, please:

Expand All @@ -47,7 +47,7 @@ When you're ready to contribute code to address an open issue, please follow the

git clone [email protected]:USERNAME/container_template.git

At this point the local clone of your fork only knows that it came from *your* repo, github.com/USERNAME/container_template.git, but doesn't know anything the *main* repo, [https://github.com/espenhgn/container_template.git](https://github.com/espenhgn/container_template). You can see this by running
At this point the local clone of your fork only knows that it came from *your* repo, github.com/USERNAME/container_template.git, but doesn't know anything the *main* repo, [https://github.com/precimed/container_template.git](https://github.com/precimed/container_template). You can see this by running

git remote -v

Expand All @@ -56,22 +56,22 @@ When you're ready to contribute code to address an open issue, please follow the
origin https://github.com/USERNAME/container_template.git (fetch)
origin https://github.com/USERNAME/container_template.git (push)

This means that your local clone can only track changes from your fork, but not from the main repo, and so you won't be able to keep your fork up-to-date with the main repo over time. Therefore you'll need to add another "remote" to your clone that points to [https://github.com/espenhgn/container_template.git](https://github.com/espenhgn/container_template). To do this, run the following:
This means that your local clone can only track changes from your fork, but not from the main repo, and so you won't be able to keep your fork up-to-date with the main repo over time. Therefore you'll need to add another "remote" to your clone that points to [https://github.com/precimed/container_template.git](https://github.com/precimed/container_template). To do this, run the following:

git remote add upstream https://github.com/espenhgn/container_template.git
git remote add upstream https://github.com/precimed/container_template.git

Now if you do `git remote -v` again, you'll see

origin https://github.com/USERNAME/container_template.git (fetch)
origin https://github.com/USERNAME/container_template.git (push)
upstream https://github.com/espenhgn/container_template.git (fetch)
upstream https://github.com/espenhgn/container_template.git (push)
upstream https://github.com/precimed/container_template.git (fetch)
upstream https://github.com/precimed/container_template.git (push)

2. **Ensure your fork is up-to-date**

<details><summary>Expand details 👇</summary><br/>

Once you've added an "upstream" remote pointing to [https://github.com/espenhgn/container_template.git](https://github.com/espenhgn/container_template), keeping your fork up-to-date is easy:
Once you've added an "upstream" remote pointing to [https://github.com/precimed/container_template.git](https://github.com/precimed/container_template), keeping your fork up-to-date is easy:

git checkout main # if not already on main
git pull --rebase upstream main
Expand All @@ -97,12 +97,12 @@ When you're ready to contribute code to address an open issue, please follow the

<details><summary>Expand details 👇</summary><br/>

Our continuous integration (CI) testing runs [a number of checks](https://github.com/espenhgn/container_template/actions) for each pull request on [GitHub Actions](https://github.com/features/actions).
Our continuous integration (CI) testing runs [a number of checks](https://github.com/precimed/container_template/actions) for each pull request on [GitHub Actions](https://github.com/features/actions).
You can run most of these tests locally, which is something you should do *before* opening a PR to help speed up the review process and make it easier for us.

And finally, please update the [CHANGELOG](https://github.com/espenhgn/container_template/blob/main/CHANGELOG.md) with notes on your contribution in the "Unreleased" section at the top.
And finally, please update the [CHANGELOG](https://github.com/precimed/container_template/blob/main/CHANGELOG.md) with notes on your contribution in the "Unreleased" section at the top.

After all of the above checks have passed, you can now open [a new GitHub pull request](https://github.com/espenhgn/container_template/pulls).
After all of the above checks have passed, you can now open [a new GitHub pull request](https://github.com/precimed/container_template/pulls).
Make sure you have a clear description of the problem and the solution, and include a link to relevant issues.

We look forward to reviewing your PR!
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ This is a template repository for singularity/dockerfile containers and build sc

[![License](http://img.shields.io/:license-GPLv3+-green.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
[![Documentation Status](https://readthedocs.org/projects/container-template/badge/?version=latest)](https://container-template.readthedocs.io/en/latest/?badge=latest)
[![Flake8 lint](https://github.com/espenhgn/container_template/actions/workflows/python.yml/badge.svg)](https://github.com/espenhgn/container_template/actions/workflows/python.yml)
[![Dockerfile lint](https://github.com/espenhgn/container_template/actions/workflows/docker.yml/badge.svg)](https://github.com/espenhgn/container_template/actions/workflows/docker.yml)
[![Flake8 lint](https://github.com/precimed/container_template/actions/workflows/python.yml/badge.svg)](https://github.com/precimed/container_template/actions/workflows/python.yml)
[![Dockerfile lint](https://github.com/precimed/container_template/actions/workflows/docker.yml/badge.svg)](https://github.com/precimed/container_template/actions/workflows/docker.yml)

## Getting started

To use these codes, **do not** clone or fork this repository, but click the green
[Use this template](https://github.com/espenhgn/container_template/generate)
[Use this template](https://github.com/precimed/container_template/generate)
button above.

You may then create a new repository on a GitHub organization or user account (`<user>`) under a new project name (`<project>`),
Expand Down
6 changes: 3 additions & 3 deletions docs/container_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ It only contains Python 3.10.

## Getting Started

* Download ``container_template.sif`` from [here](https://github.com/espenhgn/container_template/tree/main/containers)
* Download ``container_template.sif`` from [here](https://github.com/precimed/container_template/tree/main/containers)
* Import these files to your secure HPC environment
* Run ``singularity exec --no-home container_template.sif python3 --help``, to validate that you can run singularity. This command is expected to produce the standard python help message, starting like this:

Expand Down Expand Up @@ -53,7 +53,7 @@ There are several ways to give singularity container access to your data. Here a
In this way in your python command you can refer to the files as if they are in your local folder without specifying the path.

2. Now, let's assume that instead of downloading the ``container_template.sif`` container file you've cloned the entire github repo
(``git clone [email protected]:espenhgn/container_template.git``), have built and pushed the container, and have transfered it to your HPC environment.
(``git clone [email protected]:precimed/container_template.git``), have built and pushed the container, and have transfered it to your HPC environment.
Then change your folder to the root of the ``container_template`` repository, and run these commands:

```
Expand Down Expand Up @@ -91,4 +91,4 @@ There are several ways to give singularity container access to your data. Here a
singularity exec --home $PWD:/home container_template.sif python -c "print('Hello Moon')"
```

Please [let us know](https://github.com/espenhgn/container_template/issues/new) if you face any problems.
Please [let us know](https://github.com/precimed/container_template/issues/new) if you face any problems.
8 changes: 4 additions & 4 deletions scripts/PROJECT_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Revise the `<container_template>/.gitattributes` file as necessary. Some common

[![License](http://img.shields.io/:license-GPLv3+-green.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
[![Documentation Status](https://readthedocs.org/projects/container-template/badge/?version=latest)](https://container-template.readthedocs.io/en/latest/?badge=latest)
[![Flake8 lint](https://github.com/espenhgn/container_template/actions/workflows/python.yml/badge.svg)](https://github.com/espenhgn/container_template/actions/workflows/python.yml)
[![Dockerfile lint](https://github.com/espenhgn/container_template/actions/workflows/docker.yml/badge.svg)](https://github.com/espenhgn/container_template/actions/workflows/docker.yml)
[![Flake8 lint](https://github.com/precimed/container_template/actions/workflows/python.yml/badge.svg)](https://github.com/precimed/container_template/actions/workflows/python.yml)
[![Dockerfile lint](https://github.com/precimed/container_template/actions/workflows/docker.yml/badge.svg)](https://github.com/precimed/container_template/actions/workflows/docker.yml)

## Description of available containers

Expand All @@ -44,7 +44,7 @@ Please keep up to date (and update the main `<container_template>/README.md` whe

## Building/rebuilding containers

For instructions on how to build or rebuild containers using [Docker](https://www.docker.com) and [Singularity](https://docs.sylabs.io) refer to [`<container_template>/src/README.md`](https://github.com/espenhgn/container_template/blob/main/src/README.md).
For instructions on how to build or rebuild containers using [Docker](https://www.docker.com) and [Singularity](https://docs.sylabs.io) refer to [`<container_template>/src/README.md`](https://github.com/precimed/container_template/blob/main/src/README.md).

## Build the documentation

Expand All @@ -65,4 +65,4 @@ The documentation may also be hosted online on [readthedocs.org](https://readthe

## Feedback

If you face any issues, or if you need additional software, please let us know by creating a new [issue](https://github.com/espenhgn/container_template/issues/new).
If you face any issues, or if you need additional software, please let us know by creating a new [issue](https://github.com/precimed/container_template/issues/new).
2 changes: 1 addition & 1 deletion scripts/init.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
f'The project should be hosted at https://github.com/{name}/{project}')

# old variables which will be renamed
OLDNAME = 'espenhgn'
OLDNAME = 'precimed'
OLDPROJECT = 'container_template'

while True:
Expand Down

0 comments on commit d446e43

Please sign in to comment.