Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-pylib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
caosdb
Software
caosdb-pylib
Commits
d46ef343
Commit
d46ef343
authored
4 years ago
by
Florian Spreckelsen
Browse files
Options
Downloads
Patches
Plain Diff
MAINT: Rename master to main
parent
3898e808
No related branches found
No related tags found
No related merge requests found
Pipeline
#7961
passed
3 years ago
Stage: code_style
Stage: linting
Stage: test
Stage: deploy
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
README_SETUP.md
+3
-3
3 additions, 3 deletions
README_SETUP.md
RELEASE_GUIDELINES.md
+4
-4
4 additions, 4 deletions
RELEASE_GUIDELINES.md
src/doc/configuration.md
+1
-1
1 addition, 1 deletion
src/doc/configuration.md
with
9 additions
and
9 deletions
.gitlab-ci.yml
+
1
−
1
View file @
d46ef343
...
...
@@ -98,7 +98,7 @@ pages:
only
:
refs
:
-
/^release-.*$/i
-
ma
ster
-
ma
in
variables
:
# run pages only on gitlab.com
-
$CI_SERVER_HOST == "gitlab.com"
...
...
This diff is collapsed.
Click to expand it.
README_SETUP.md
+
3
−
3
View file @
d46ef343
...
...
@@ -75,7 +75,7 @@ current working directory will be read additionally, if it exists.
Here, we will look at the most common configuration options. For a full and
comprehensive description please check out
[
pycaosdb.ini file
](
https://gitlab.com/caosdb/caosdb-pylib/-/blob/ma
ster
/examples/pycaosdb.ini
)
[
pycaosdb.ini file
](
https://gitlab.com/caosdb/caosdb-pylib/-/blob/ma
in
/examples/pycaosdb.ini
)
You can download this file and use it as a starting point.
...
...
@@ -120,7 +120,7 @@ cacert=/path/to/caosdb.ca.pem
### Further Settings ##
As mentioned above, a complete list of options can be found in the
[
pycaosdb.ini file
](
https://gitlab.com/caosdb/caosdb-pylib/-/blob/ma
ster
/examples/pycaosdb.ini
)
in
[
pycaosdb.ini file
](
https://gitlab.com/caosdb/caosdb-pylib/-/blob/ma
in
/examples/pycaosdb.ini
)
in
the examples folder of the source code.
## Try it out ##
...
...
@@ -158,4 +158,4 @@ Build documentation in `build/` with `make doc`.
-
`recommonmark`
### Troubleshooting ##
If the client is to be executed directly from the
`/src`
folder, an initial
`.\setup.py install --user`
must be called.
\ No newline at end of file
If the client is to be executed directly from the
`/src`
folder, an initial
`.\setup.py install --user`
must be called.
This diff is collapsed.
Click to expand it.
RELEASE_GUIDELINES.md
+
4
−
4
View file @
d46ef343
...
...
@@ -24,9 +24,9 @@ guidelines of the CaosDB Project
variables and set
`ISRELEASED`
to
`True`
. Use the possibility to issue
pre-release versions for testing.
5.
Merge the release branch into the ma
ster
branch.
5.
Merge the release branch into the ma
in
branch.
6.
Tag the latest commit of the ma
ster
branch with
`v<VERSION>`
.
6.
Tag the latest commit of the ma
in
branch with
`v<VERSION>`
.
7.
Delete the release branch.
...
...
@@ -35,8 +35,8 @@ guidelines of the CaosDB Project
9.
Publish the release by executing
`./release.sh`
with uploads the caosdb
module to the Python Package Index
[
pypi.org
](
https://pypi.org
)
.
10.
Merge the ma
ster
branch back into the dev branch.
10.
Merge the ma
in
branch back into the dev branch.
11.
After the merge of ma
ster
to dev, start a new development version by
11.
After the merge of ma
in
to dev, start a new development version by
setting
`ISRELEASED`
to
`False`
and by increasing at least the
`MIRCO`
version in
[
setup.py
](
./setup.py
)
This diff is collapsed.
Click to expand it.
src/doc/configuration.md
+
1
−
1
View file @
d46ef343
...
...
@@ -50,5 +50,5 @@ debugging (which I hope will not be necessary for this tutorial) or if you want
the internals of the protocol.
A complete list of options can be found in the
[
pycaosdb.ini file
](
https://gitlab.com/caosdb/caosdb-pylib/-/blob/ma
ster
/examples/pycaosdb.ini
)
in
[
pycaosdb.ini file
](
https://gitlab.com/caosdb/caosdb-pylib/-/blob/ma
in
/examples/pycaosdb.ini
)
in
the examples folder of the source code.
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