Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cleanup api logging (DSP-1076) #46

Merged
merged 19 commits into from Feb 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion MANIFEST.in
@@ -1,5 +1,5 @@
include README.md
include knora/dsplib/utils/knora-schema.json
include knora/dsplib/utils/knora-schema-lists.json
include knora/knora-data-schema.xsd
include knora/dsplib/utils/knora-data-schema.xsd
include knora/icons/knora-py-logo.png
7 changes: 7 additions & 0 deletions Makefile
Expand Up @@ -71,4 +71,11 @@ clean: ## cleans the project directory
help: ## this help
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort

.PHONY: run
run: ## create dist, inatall and run
$(MAKE) clean
$(MAKE) dist
$(MAKE) install
dsp-tools

.DEFAULT_GOAL := help
4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -53,7 +53,9 @@ $ make test

## Publishing to PyPi

Generate distribution package. Make sure you have the latest versions of `setuptools` and `wheel` installed:
Generate distribution package. Make sure you have the latest versions of `setuptools` and `wheel` installed.
Remove the `dist`and `buil`-directories: `rm -rf bild dist`


```bash
$ make upgrade-dist-tools
Expand Down
6 changes: 5 additions & 1 deletion docs/dsp-tools-create.md
Expand Up @@ -325,7 +325,11 @@ This object contains _user_-definitions. You can set user traits here. A user ha
- _familyName_: Surname of the user.
- _password_: Password of the user.
- _lang_: The preferred language of the user: "en", "de", "fr", "it" [optional, default: "en"].
- _projects_: List of projects the user belongs to.
- _projects_: List of projects the user belongs to. The project name has to be followed by a ":" and
either "member" or "admin". This indicates if the new user has admin rights in the given project or
is a oridnary user. This `myproject:admin` would add the user as admin to the project "myproject".
The given project defined in the same ontology file has no name, so only ":admin" or ":member" is
required. A user must be member of at least one project.

Example:
```json
Expand Down