Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ESCAPE2020
WP3
template_project_escape
Commits
00f3db50
Commit
00f3db50
authored
Aug 07, 2020
by
Enrique Garcia
Browse files
update files due to transfer of subgroup - and move guidelines to /wp3/guidelines
parent
a03d0146
Pipeline
#79115
passed with stage
in 3 minutes and 23 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
26 deletions
+15
-26
.escape.yml
.escape.yml
+1
-1
.gitlab-ci.yml
.gitlab-ci.yml
+3
-3
.zenodoci/README_zenodoci.md
.zenodoci/README_zenodoci.md
+1
-1
README.md
README.md
+7
-18
Singularity
Singularity
+1
-1
setup.py
setup.py
+1
-1
singularity_utils/singularity_template_escape.recipe
singularity_utils/singularity_template_escape.recipe
+1
-1
No files found.
.escape.yml
View file @
00f3db50
...
...
@@ -10,7 +10,7 @@ contact:
-
name
:
Enrique Garcia
-
email
:
garcia@lapp.in2p3.fr
license
:
MIT
url
:
https://gitlab.in2p3.fr/escape2020/
escape
/template_project_escape
url
:
https://gitlab.in2p3.fr/escape2020/
wp3
/template_project_escape
description
:
A template project to provide software to ESCAPE.
# Optional entries
...
...
.gitlab-ci.yml
View file @
00f3db50
...
...
@@ -56,7 +56,7 @@ deploy_zenodo:
### 2 - Get the last tag/release of the repository
-
export REPOSITORY_NAME=template_project_escape
-
export REPOSITORY_URL=https://gitlab.in2p3.fr/escape2020/
escape
/$REPOSITORY_NAME.git
-
export REPOSITORY_URL=https://gitlab.in2p3.fr/escape2020/
wp3
/$REPOSITORY_NAME.git
-
export LAST_RELEASE=`git ls-remote --tags --refs --sort="v:refname" $REPOSITORY_URL | tail -n1 | sed 's/.*\///'`
### 3 - Download the repository and move it to the build directory
...
...
@@ -64,11 +64,11 @@ deploy_zenodo:
-
>
if [ -z "$LAST_RELEASE" ]; then
echo "No tag / new release found ! - Or error when parsing. Downloading last commit to the repository (master branch) ;"; \
wget -O $REPOSITORY_NAME-master.zip https://gitlab.in2p3.fr/escape2020/
escape
/"$REPOSITORY_NAME"/-/archive/master/"$REPOSITORY_NAME"-master.zip; \
wget -O $REPOSITORY_NAME-master.zip https://gitlab.in2p3.fr/escape2020/
wp3
/"$REPOSITORY_NAME"/-/archive/master/"$REPOSITORY_NAME"-master.zip; \
mv $REPOSITORY_NAME-master.zip ./build
else
echo "$LAST_RELEASE tag / release found !"; \
wget -O $REPOSITORY_NAME-$LAST_RELEASE.zip https://gitlab.in2p3.fr/escape2020/
escape
/"$REPOSITORY_NAME"/-/archive/"$LAST_RELEASE"/"$REPOSITORY_NAME"-"$LAST_RELEASE".zip; \
wget -O $REPOSITORY_NAME-$LAST_RELEASE.zip https://gitlab.in2p3.fr/escape2020/
wp3
/"$REPOSITORY_NAME"/-/archive/"$LAST_RELEASE"/"$REPOSITORY_NAME"-"$LAST_RELEASE".zip; \
mv $REPOSITORY_NAME-$LAST_RELEASE.zip ./build
fi
...
...
.zenodoci/README_zenodoci.md
View file @
00f3db50
...
...
@@ -4,7 +4,7 @@
## Continuous Deployment to Zenodo
The source code contained in this folder is based on the
[
ZenodoCI
](
https://gitlab.in2p3.fr/escape2020/
escape
/zenodoci
)
The source code contained in this folder is based on the
[
ZenodoCI
](
https://gitlab.in2p3.fr/escape2020/
wp3
/zenodoci
)
project. The library was developed specifically to perform a deploy stage (to the Zenodo repository) in a GitLab CI
pipeline that
**could be implemented in any external project**
.
...
...
README.md
View file @
00f3db50
# template_project_escape
[

](https://doi.org/10.5281/zenodo.3884963)
[

](
https://gitlab.in2p3.fr/escape2020/escape/template_project_escape/-/commits/master)
[

](
https://travis-ci.com/garciagenrique/template_project_escape)
[

](https://opensource.org/licenses/MIT)
[

](
https://gitlab.in2p3.fr/escape2020/wp3/template_project_escape/-/commits/master)
[

](https://opensource.org/licenses/MIT)
<p
align=
"center"
>
...
...
@@ -34,27 +32,18 @@ It would be highly suitable to include too:
**Please feel free to clone / fork / template this project!**
(For example, look to left of the
`Clone or download`
button in the
[
GitHub
](
https://github.com/garciagenrique/template_project_escape
)
site).
Take few minutes to check the
[
ESCAPE repository's guidelines
](
https://gitlab.in2p3.fr/escape2020/guidelines
)
too.
# Contributing guidelines for the ESCAPE repository
If you wish to provide software to the ESCAPE repository:
-
You should ask developer access through the Gitlab interface and send an email to vuillaume [at] lapp.in2p3.fr with
your institution email.
-
You will then be able to open a new project and transfer code.
-
Check the
[
ESCAPE repository's guidelines
](
https://gitlab.in2p3.fr/escape2020/wp3/guidelines
)
.
-
All the code provided should be uploaded
from
the
[
Zenodo ESCAPE community
](
https://zenodo.org/communities/escape2020/
)
.
-
All the code provided should be uploaded
to
the
[
Zenodo ESCAPE community
](
https://zenodo.org/communities/escape2020/
)
.
-
For a detailed explanation of how to submit a contribution to a project / repository (Fork, create a branch, make
a pull request...), please check the
[
opensource guide
](
https://opensource.guide/how-to-contribute/#how-to-submit-a-contribution
)
and/or the
[
git's documentation
](
https://git-scm.com/doc
)
.
-
Once you are granted with developer access, you will be able to add a new blank project / import it (from other
common repository managers, i.e., GitHub, GitLab, Bitbucket, Fogbugz...) to the
[
GitLab/ESCAPE
](
https://gitlab.in2p3.fr/escape2020
)
main page.
***PLEASE NOTE**
*
that if you have login GitLab by using the
`[Shibbolenth]`
service (eduGAIN, Fédération d'Identités
RENATER), you will need to
[
add a SSH key
](
https://gitlab.in2p3.fr/help/ssh/README#generating-a-new-ssh-key-pair
)
to
your GitLab profile if you want to 'push' your changes to the server.
...
...
@@ -75,7 +64,7 @@ please have a look to the `singularity_utils` directory.
# Installation
```
sh
$
git clone https://gitlab.in2p3.fr/escape2020/
escape
/template_project_escape.git
$
git clone https://gitlab.in2p3.fr/escape2020/
wp3
/template_project_escape.git
$
cd
template_project_escape
$
python setup.py
install
```
...
...
@@ -96,7 +85,7 @@ Please check the licenses of the code within in the `.gitlabci`, `.zenodoci` dir
to your project.
# Report an issue / Ask a question
Use the
[
GitLab repository Issues
](
https://gitlab.in2p3.fr/escape2020/
escape
/template_project_escape/-/issues
)
.
Use the
[
GitLab repository Issues
](
https://gitlab.in2p3.fr/escape2020/
wp3
/template_project_escape/-/issues
)
.
# Contact
Email to vuillaume [at] lapp.in2p3.fr / garcia [at] lapp.in2p3.fr.
Singularity
View file @
00f3db50
...
...
@@ -22,7 +22,7 @@ From: ubuntu:latest
conda env create -f environment.yml
conda activate escape_template
git clone https://gitlab.in2p3.fr/escape2020/
escape
/template_project_escape.git
git clone https://gitlab.in2p3.fr/escape2020/
wp3
/template_project_escape.git
cd template_project_escape
git fetch --tags
tag=$(git describe --tags `git rev-list --tags --max-count=1`)
...
...
setup.py
View file @
00f3db50
...
...
@@ -16,6 +16,6 @@ setuptools.setup(name='template_project_escape',
author
=
'https://github.com/garciagenrique'
,
author_email
=
'garcia<at>lapp.in2p3.fr'
,
license
=
'Open Source. MIT license. See LICENSE file.'
,
url
=
'https://gitlab.in2p3.fr/escape2020/
escape
/template_project_escape'
,
url
=
'https://gitlab.in2p3.fr/escape2020/
wp3
/template_project_escape'
,
entry_points
=
entry_points
,
)
singularity_utils/singularity_template_escape.recipe
View file @
00f3db50
...
...
@@ -22,7 +22,7 @@ From: ubuntu:latest
conda env create -f environment.yml
conda activate escape_template
git clone https://gitlab.in2p3.fr/escape2020/
escape
/template_project_escape.git
git clone https://gitlab.in2p3.fr/escape2020/
wp3
/template_project_escape.git
cd template_project_escape
git fetch --tags
tag=$(git describe --tags `git rev-list --tags --max-count=1`)
...
...
Enrique Garcia
@garcia
mentioned in issue
#5 (closed)
·
Aug 07, 2020
mentioned in issue
#5 (closed)
mentioned in issue #5
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment