Rflo/master

.gitignore

@@ -8,12 +8,12 @@ artifacts
 build
 build-stamp
 configure-stamp
-contrib/template_project/.rmtoo_dependencies
-contrib/template_project/latex/requirements.aux
-contrib/template_project/latex/requirements.log
-contrib/template_project/latex/requirements.out
-contrib/template_project/latex/requirements.pdf
-contrib/template_project/latex/requirements.toc
+doc/template_project/.rmtoo_dependencies
+doc/template_project/latex/requirements.aux
+doc/template_project/latex/requirements.log
+doc/template_project/latex/requirements.out
+doc/template_project/latex/requirements.pdf
+doc/template_project/latex/requirements.toc
 debian/files
 debian/rmtoo
 debian/rmtoo.debhelper.log
@@ -27,5 +27,8 @@ doc/presentations/reqspricing.png
 make_tests.log
 result.xml
 rmtoo.egg-info/
+.tox
+MANIFEST
+dist
 rmtoo/coverage.xml
 rmtoo/result.xml

.travis.yml

@@ -31,9 +31,26 @@ python:
   - "3.8"
 
 # Required to run the respective python env in tox
-install: pip install tox-travis
+install: pip install tox-travis flit
 
 # command to run tests
 script:
   - tox
   - tox -e pep8
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
+# The FLIT_PASSWORD environment variable needs to be set in travis with a
+# working pypi token, see https://pypi.org/help/#apitoken
+jobs:
+  include:
+    - stage: deploy
+      python: 3.8
+      env:
+      - FLIT_USERNAME=__token__
+      deploy:
+        provider: script
+        script: flit publish
+        on:
+          tags: true

CONTRIBUTING.rst

@@ -31,7 +31,7 @@ Contributor License Agreement
 When you actively push changes to one of our development platforms,
 e.g. using a pull or merge request, you agree that your contribution
 is placed under GPL3 for the complete project - except the contents of
-the contrib/template_project folder which is placed under Apache 2
+the doc/template_project folder which is placed under Apache 2
 license.
 
 New files must include an appropriate license header - including the

COPYING

@@ -9,4 +9,5 @@ Raerener Strasse 10b
 D-52076 Aachen
 [email protected]
 
-It can be distributed using the GPL v3 (see gpl-3.0.txt).
+and others. It can be distributed using the GPL v3 (see LICENSE).
+

MANIFEST.in

@@ -1,8 +1,7 @@
 include *.txt
 include *.rst
 recursive-include doc *
-recursive-include contrib *
 recursive-include share *
-recursive-include rmtoo/collection *
+recursive-include collection *
 prune *~
 prune *.pyc

Makefile

@@ -40,10 +40,10 @@ artifacts/req-graph2.png: artifacts/req-graph2.dot
 # backlog creation.
 artifacts/requirements.pdf: ${REQS_LATEX2} doc/latex2/requirements.tex
 	(cd artifacts && \
-	   gnuplot ../contrib/gnuplot_stats_reqs_cnt.inc && \
+	   gnuplot ../src/rmtoo/contrib/gnuplot_stats_reqs_cnt.inc && \
 	   epstopdf stats_reqs_cnt.eps)
 	(cd artifacts && \
-	   gnuplot ../contrib/gnuplot_stats_burndown.inc && \
+	   gnuplot ../src/rmtoo/contrib/gnuplot_stats_burndown.inc && \
 	   epstopdf stats_burndown.eps)
 	(cd artifacts && pdflatex ../doc/latex2/requirements.tex; \
 		pdflatex ../doc/latex2/requirements.tex; \

Readme.rst

@@ -98,7 +98,7 @@ possibility to use Amazon AWS EC2 preinstalled VMs.
 
 More details are available in a dedicated Readme_.
 
-.. _Readme: contrib/vmsetup/Readme.rst
+.. _Readme: doc/vmsetup/Readme.rst
 
 
 Installation
@@ -135,7 +135,6 @@ project.
 The basic steps are:
 
 1) Copy over the template project to some other directory.
-2) Set up the environment
 3) Run ``make``
 4) Check, if everything worked
 5) Start changing / adapting things to your needs
@@ -180,7 +179,8 @@ is needed only once.
 
    # cd to virtualenv directory - if not already there
    $ cd RMTOO
-   $ cp -r venv/rmtoo/contrib/template_project MyNewProject
+   $ git clone https://github.com/florath/rmtoo.git
+   $ cp -r rmtoo/doc/template_project MyNewProject
 
 Usage
 -----
@@ -190,7 +190,6 @@ To create all the artifacts for the template project, execute
 .. code:: bash
 
    $ cd MyNewProject
-   $ source ./setenv.sh VENV
    $ make
    $ ls artifacts
 
@@ -206,21 +205,21 @@ When using the virtualenv, use
 
 .. code:: bash
 
-   $ man -l venv/rmtoo/share/man/man7/rmtoo.7
+   $ man -l rmtoo/share/man/man7/rmtoo.7
 
 to get an overview over all available man pages.
 Those other man pages you can read also with man. Replace the
 file name with the appropriate manual page, like:
 
 .. code:: bash
 
-   $ man -l venv/rmtoo/share/man/man7/rmtoo-analytics.7
+   $ man -l rmtoo/share/man/man7/rmtoo-analytics.7
 
 Additional Documentation
 ------------------------
 
 Additional documentation can be found in the directories
-``RMTOO/venv/rmtoo/doc`` (especially the Readme files).
+``RMTOO/rmtoo/doc`` (especially the Readme files).
 
 Other Documentation
 ===================
@@ -268,7 +267,7 @@ Emacs Mode for Editing Requirements
 
 When using the tar package, emacs mode can be loaded in emacs by:
 ``M-x load-file``
-point to ``RMTOO/venv/rmtoo/contrib/req-mode.el``
+point to ``RMTOO/rmtoo/src/rmtoo/contrib/req-mode.el``
 All files with suffix ``.req`` will now use the requirements editing
 mode.
 

doc/Config1.json

@@ -47,7 +47,7 @@
 			"requirements_dirs": [ "doc/requirements" ],
 			"topics_dirs": [ "doc/topics" ],
 			"topic_root_node": "ReqsDocument",
-			"constraints_dirs": [ "rmtoo/collection/constraints" ] }
+			"constraints_dirs": [ "collection/constraints" ] }
 		],
 		[
 		    "ignore:git", {
@@ -56,15 +56,15 @@
 			"requirements_dirs": [ "doc/requirements" ],
 			"topics_dirs": [ "doc/topics"] ,
 			"topic_root_node": "ReqsDocument",
-			"constraints_dirs": [ "rmtoo/collection/constraints" ] }
+			"constraints_dirs": [ "collection/constraints" ] }
 		],
 	        [
 		    "filesystem", {
 		        "requirements_dirs": [ "doc/requirements" ],
 		        "testcases_dirs": [ "doc/testcases" ],
 			"topics_dirs": [ "doc/topics" ],
 			"topic_root_node": "ReqsDocument",
-			"constraints_dirs": [ "rmtoo/collection/constraints" ] }
+			"constraints_dirs": [ "collection/constraints" ] }
 		] 
 	    ],
             "output": {

doc/examples/EMailClient/.gitlab-ci.yml

@@ -10,12 +10,6 @@ cache:
     - /var/cache/apt/archives/
     - ./downloads
 
-before_script:
-    # copy rmtoo's default Makefile and setenv.sh if the repo doesn't have them.
-    - if ! test -f "./setenv.sh"; then cp /usr/share/doc/rmtoo/contrib/template_project/setenv.sh .; fi
-    - source ./setenv.sh DEB
-    - if ! test -f "./Makefile"; then cp ${RMTOO_CONTRIB_DIR}/rmtoo/contrib/template_project/Makefile .; fi
-
 createArtifacts:
     stage: build
     #tags: rmtoo #add this in when you create a custom runner

doc/examples/EMailClient/Config.json

@@ -28,7 +28,7 @@
 		        "requirements_dirs": [ "requirements" ],
 			"topics_dirs": [ "topics" ],
 			"topic_root_node": "EMailClient",
-			"constraints_dirs": [ "../../../rmtoo/collection/constraints" ] }
+			"constraints_dirs": [ "../../../collection/constraints" ] }
 		] 
 	    ],
             "output": {

doc/examples/EMailClient/Makefile

@@ -19,8 +19,10 @@ force:
 # ie:
 #      make RMTOO_CONFIG=YourConfig.json
 #
+RMTOO_CALL ?= rmtoo
 RMTOO_CONFIG=Config.json
 CALL_RMTOO=${RMTOO_CALL} -j file://${RMTOO_CONFIG}
+RMTOO_CONTRIB_DIR ?= $(shell rmtoo-contrib-dir)
 
 #
 # Dependency handling
@@ -46,13 +48,13 @@ artifacts/req-graph2.png: artifacts/req-graph2.dot
 # backlog creation.
 artifacts/requirements.pdf: ${REQS_LATEX2} latex/requirements.tex
 	(cd artifacts && \
-	   gnuplot ${RMTOO_CONTRIB_DIR}/contrib/gnuplot_stats_reqs_cnt.inc && \
+	   gnuplot ${RMTOO_CONTRIB_DIR}/gnuplot_stats_reqs_cnt.inc && \
 	   epstopdf stats_reqs_cnt.eps)
 	(cd artifacts && \
-	   gnuplot ${RMTOO_CONTRIB_DIR}/contrib/gnuplot_stats_burndown.inc && \
+	   gnuplot ${RMTOO_CONTRIB_DIR}/gnuplot_stats_burndown.inc && \
 	   epstopdf stats_burndown.eps)
 	(cd artifacts && \
-	   gnuplot ${RMTOO_CONTRIB_DIR}/contrib/gnuplot_stats_sprint_burndown.inc && \
+	   gnuplot ${RMTOO_CONTRIB_DIR}/gnuplot_stats_sprint_burndown.inc && \
 	   epstopdf stats_sprint_burndown.eps)
 	(cd artifacts && pdflatex ../latex/requirements.tex; \
 		pdflatex ../latex/requirements.tex; \