resolved merge conflict in setup.py

diggr · Mar 1, 2019 · 40059f7 · 40059f7
2 parents 2f39843 + f4ac92c
commit 40059f7
Show file tree

Hide file tree

Showing 56 changed files with 1,411 additions and 761 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ main.py
 .idea
 pit/test
 .pytest_cache
+test_pit.py
 
 
 build/

diff --git a/LICENSE b/LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,8 @@
 include LICENSE
 
-include pit/provis/templates/*.html
+include provit/browser/templates/*.html
+include provit/browser/static/js/*.js
+include provit/browser/static/css/*.css
 
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

diff --git a/Makefile b/Makefile
diff --git a/README.rst b/README.rst
@@ -4,15 +4,22 @@ P(ROV)IT - PROVenance integration tools
 |Python 3.6| |GitHub license| |GitHub issues| |Docs passing|
 
 PROVIT is a light, dezentralized provenance tracking framework. It allows
-the user to track workflows and modifications of data and files. A
-small subset of the `W3C <https://www.w3.org/>`__ `PROV-O
-vocabulary <https://www.w3.org/TR/prov-o/>`__ is implemented. Its aim is to
-provided an easy to use interface for users who have never worked with provenance
+the user to track workflows and modifications of data and files. 
+
+ROVIT works completely decentralized, all information is stored in .prov
+files (as JSON-LD RDF graphs) along it's corresponding data file in the file system.
+No central database or server setup is needed.  
+
+Asmall subset of the `W3C <https://www.w3.org/>`__ `PROV-O
+vocabulary <https://www.w3.org/TR/prov-o/>`__ is implemented. 
+
+Its aim is to provided an easy to use interface for users who have never worked with provenance
 tracking before. It you feel limited by PROVIT you should have a look at
 the more extensive implementation `prov <https://github.com/trungdong/prov/>`__.
 
 Full documentation is available under: `provit.readthedocs.io <https://provit.readthedocs.io/en/latest/>`__.
 
+
 Requirements
 ------------
 
@@ -58,44 +65,49 @@ Usage
 Provenance Integration Tools provide a command line client which can be
 used *out of the box* to enrich any file based data with provenance
 information. Furthermore the provenance class and vocabulary shipped
-with *PIT* can be used within other applications.
+with *provit* can be used within other applications.
 
 Command Line Client
 ~~~~~~~~~~~~~~~~~~~
 
 Usage:
 
+Open provit Browser:
+
+.. code:: zsh
+
+    $ provit browser
+
+Add provenace event to a file:
+
 .. code:: zsh
 
-    $ pit [OPTIONS] FILEPATH
+    $ pit add FILEPATH [OPTIONS]
 
 Options:
 
---add    Add provenance information layer to file
 -a AGENT, --agent AGENT    Provenance information: agent
 --activity ACTIVITY        Provenance information: activity
 -d DESCRIPTION, --desc DESCRIPTION     Provenance information: Description
                             of the data manipulation process
 -o ORIGIN, --origin ORIGIN    Provenance information: Data origin
 -s SOURCES, --sources SOURCES    Provenance information: Source files
--b, --browser     Provenance browser
--n NAMESPACE, --namespace NAMESPACE    Provenance Namespace, default: http://provit.diggr.link/
 --help      Show this message and exit.
 
 Provenance Class
 ~~~~~~~~~~~~~~~~
 
 .. code:: python
 
-    from pit.prov import Provenance
+    from provit import Provenance
 
     # load prov data for a file, or create new prov for file
     prov = Provenance(<filepath>)
 
     # add provenance metadata
-    prov.add(agent="agent", activity="activity", description="...")
-    prov.add_primary_source("primary_source", url="http://...", comment="...")
-    prov.add_sources(["filepath1", "filepath2"])
+    prov.add(agents=[ "agent" ], activity="activity", description="...")
+    prov.add_primary_source("primary_source")
+    prov.add_sources([ "filepath1", "filepath2" ])
 
     # return provenance as json tree
     prov_dict = prov.tree()
@@ -141,12 +153,7 @@ FAQ / Paradigms
 Can I add multiple agents to an activity?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-No. The reason is: If you can distinguish the activities or impact of
-the agent, then you have multiple agents with *multiple activities*.
-E.g. if you let three students help you proofreading a file and you get
-back *1* revised version, then the three students are *1 agent* as you
-cannot distinguish between their results. If you get back *3 versions*
-you have *3 agents* and *3 activities*.
+Yes.
 
 Overview
 --------

diff --git a/assets/provit.svg b/assets/provit.svg
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/modules.rst b/docs/modules.rst
diff --git a/docs/source/conf.py b/docs/source/conf.py
diff --git a/docs/source/index.rst b/docs/source/index.rst
diff --git a/docs/source/modules.rst b/docs/source/modules.rst
diff --git a/docs/source/pit.provis.rst b/docs/source/pit.provis.rst
diff --git a/docs/source/pit.rst b/docs/source/pit.rst
diff --git a/docs/source/readme.rst b/docs/source/readme.rst
diff --git a/pit/__init__.py b/pit/__init__.py
diff --git a/pit/check.py b/pit/check.py
diff --git a/pit/config.py b/pit/config.py