Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Python Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Templates
Python Project
Commits
de2b0966
Commit
de2b0966
authored
3 years ago
by
Tamas Gal
Browse files
Options
Downloads
Plain Diff
Merge branch '4-km3pipe-and-km3io-dependencies-assumed-by-default' into 'master'
Resolve "km3pipe and km3io dependencies assumed by default" Closes
#4
See merge request
!2
parents
f093d1b7
4763bfd9
No related branches found
No related tags found
1 merge request
!2
Resolve "km3pipe and km3io dependencies assumed by default"
Pipeline
#24135
passed
3 years ago
Stage: install
Stage: install-dev
Stage: test
Stage: doc
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
{{cookiecutter.project_slug}}/CONTRIBUTING.rst
+3
-3
3 additions, 3 deletions
{{cookiecutter.project_slug}}/CONTRIBUTING.rst
{{cookiecutter.project_slug}}/Makefile
+0
-2
0 additions, 2 deletions
{{cookiecutter.project_slug}}/Makefile
with
3 additions
and
5 deletions
{{cookiecutter.project_slug}}/CONTRIBUTING.rst
+
3
−
3
View file @
de2b0966
...
...
@@ -52,9 +52,9 @@ Get a local copy to work on (use the SSH address `git@git...`, not the HTTP one)
git clone git@git.km3net.de:YOUR_USERNAME/{{cookiecutter.project_slug}}
Now you need to add a reference to the original repository, so you can sync your
own fork with the
KM3Pipe
repository::
own fork with the
original
repository::
cd
km3pipe
cd
{{cookiecutter.project_slug}}
git remote add upstream {{cookiecutter.gitlab_repo_path}}
...
...
@@ -76,7 +76,7 @@ using the ``upstream/...`` prefix::
If you want to update for example your **own** ``master`` branch
to contain all the changes on the official ``master`` branch of
KM3Pipe
,
to contain all the changes on the official ``master`` branch of
the original repository
,
switch to it first with::
git checkout master
...
...
This diff is collapsed.
Click to expand it.
{{cookiecutter.project_slug}}/Makefile
+
0
−
2
View file @
de2b0966
...
...
@@ -35,7 +35,6 @@ dependencies:
.PHONY
:
black
black
:
black km3io
black examples
black tests
black doc/conf.py
...
...
@@ -43,7 +42,6 @@ black:
.PHONY
:
black-check
black-check
:
black
--check
km3io
black
--check
examples
black
--check
tests
black
--check
doc/conf.py
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment