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
a4bc8bb4
Commit
a4bc8bb4
authored
1 year ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Plain Diff
Merge tag 'linkahead-rename-step-2' into f-linkahead-rename-tmp
parents
0062a9bc
8de757e6
No related branches found
No related tags found
1 merge request
!114
Helper MR
Pipeline
#41719
passed
1 year ago
Stage: code_style
Stage: linting
Stage: test
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
how-to-merge-after-rename.txt
+11
-0
11 additions, 0 deletions
how-to-merge-after-rename.txt
setup.py
+4
-1
4 additions, 1 deletion
setup.py
src/doc/tutorials/errors.rst
+2
-2
2 additions, 2 deletions
src/doc/tutorials/errors.rst
with
17 additions
and
3 deletions
how-to-merge-after-rename.txt
0 → 100644
+
11
−
0
View file @
a4bc8bb4
git merge linkahead-rename-step-1
# resolve potential conflicts and commit
rm -rf src/linkahead
git mv src/caosdb/ src/linkahead
rm -rf src/caosdb
python3 create_slim_linkahead_wrapper.py
git add src
git ci -m "MAINT: rename caosdb to linkahead (module)"
git merge linkahead-rename-step-2
# resolve potential conflicts and commit
git merge dev
This diff is collapsed.
Click to expand it.
setup.py
+
4
−
1
View file @
a4bc8bb4
...
...
@@ -188,7 +188,10 @@ def setup_package():
package_data
=
{
'
linkahead
'
:
[
'
cert/indiscale.ca.crt
'
,
'
schema-pycaosdb-ini.yml
'
],
},
scripts
=
[
"
src/linkahead/utils/linkahead_admin.py
"
]
scripts
=
[
"
src/linkahead/utils/caosdb_admin.py
"
,
"
src/linkahead/utils/linkahead_admin.py
"
]
)
try
:
setup
(
**
metadata
)
...
...
This diff is collapsed.
Click to expand it.
src/doc/tutorials/errors.rst
+
2
−
2
View file @
a4bc8bb4
...
...
@@ -16,11 +16,11 @@ following. For more information on specific error types, see also the
.. note::
Starting from Py
LinkAhead
0.5, the error handling has changed
Starting from Py
CaosDB
0.5, the error handling has changed
significantly. New error classes have been introduced and the
behavior of ``TransactionError`` and ``EntityError`` has been
re-worked. In the following, only the "new" errors are
discussed. Please refer to the documentation of Py
LinkAhead
0.4.1 and
discussed. Please refer to the documentation of Py
CaosDB
0.4.1 and
earlier for the old error handling.
LinkAheadException
...
...
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