From d46ef34319e260ee587039255312853ba8dc7b2d Mon Sep 17 00:00:00 2001
From: fspreck <f.spreckelsen@indiscale.com>
Date: Fri, 14 May 2021 09:10:27 +0200
Subject: [PATCH] MAINT: Rename master to main
---
.gitlab-ci.yml | 2 +-
README_SETUP.md | 6 +++---
RELEASE_GUIDELINES.md | 8 ++++----
src/doc/configuration.md | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b24c1ef..a97f9d93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,7 +98,7 @@ pages:
only:
refs:
- /^release-.*$/i
- - master
+ - main
variables:
# run pages only on gitlab.com
- $CI_SERVER_HOST == "gitlab.com"
diff --git a/README_SETUP.md b/README_SETUP.md
index 4980b850..9deadefb 100644
--- a/README_SETUP.md
+++ b/README_SETUP.md
@@ -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/master/examples/pycaosdb.ini)
+[pycaosdb.ini file](https://gitlab.com/caosdb/caosdb-pylib/-/blob/main/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/master/examples/pycaosdb.ini) in
+[pycaosdb.ini file](https://gitlab.com/caosdb/caosdb-pylib/-/blob/main/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.
diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md
index dd6d5af4..e015b598 100644
--- a/RELEASE_GUIDELINES.md
+++ b/RELEASE_GUIDELINES.md
@@ -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 master branch.
+5. Merge the release branch into the main branch.
-6. Tag the latest commit of the master branch with `v<VERSION>`.
+6. Tag the latest commit of the main 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 master branch back into the dev branch.
+10. Merge the main branch back into the dev branch.
-11. After the merge of master to dev, start a new development version by
+11. After the merge of main 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)
diff --git a/src/doc/configuration.md b/src/doc/configuration.md
index b2de2781..6e53542f 100644
--- a/src/doc/configuration.md
+++ b/src/doc/configuration.md
@@ -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/master/examples/pycaosdb.ini) in
+[pycaosdb.ini file](https://gitlab.com/caosdb/caosdb-pylib/-/blob/main/examples/pycaosdb.ini) in
the examples folder of the source code.
--
GitLab