Skip to content

Commit

Permalink
Merge pull request #50 from rdmorganiser/0.9.0
Browse files Browse the repository at this point in the history
0.9.0
  • Loading branch information
jochenklar committed Nov 10, 2017
2 parents 05e7726 + c1e658b commit 2c4463c
Show file tree
Hide file tree
Showing 534 changed files with 6,077 additions and 4,526 deletions.
8 changes: 2 additions & 6 deletions .coveragerc
@@ -1,13 +1,9 @@
[run]
source = .
source = rdmo

[report]
omit =
rdmo/wsgi.py
rdmo/settings/*
apps/core/management/commands/*
env/*
*/migrations/*
rdmo/core/management/commands/*
exclude_lines =
raise Exception
except ImportError:
13 changes: 6 additions & 7 deletions .gitignore
@@ -1,11 +1,11 @@
rdmo/settings/local.py
testing/config/settings/local.py

components_root
static_root
media_root
components_root

docs/_build*

__pycache__
*.pyc
*~
*.swp
Expand All @@ -15,10 +15,9 @@ env
env2
env3

*.sqlite3

.coverage
htmlcov

themes
theme
build
dist
*.egg-info
26 changes: 17 additions & 9 deletions .travis.yml
@@ -1,27 +1,35 @@
language: python
cache:
directories:
- $HOME/virtualenv
cache: pip

services:
- postgresql
- mysql

python:
- 2.7
- 3.4
- 3.5
- 3.6

env:
- DB=postgres
- DB=mysql
- DB=sqlite3

before_install:
- sudo apt-get install pandoc

install:
- pip install -r requirements/base.txt
- pip install -r requirements/postgres.txt
- pip install -r requirements/mysql.txt
- pip install -r requirements/testing.txt
- pip install -e .
- pip install mysqlclient
- pip install psycopg2
- pip install coveralls

before_script:
- sh -c "cp testing/settings/$DB.py rdmo/settings/local.py; fi"
- sh -c "cp testing/config/settings/$DB.py testing/config/settings/local.py; fi"

script:
- coverage run manage.py test
- coverage run testing/runtests.py

after_success:
- coveralls
5 changes: 5 additions & 0 deletions MANIFEST.in
@@ -0,0 +1,5 @@
graft rdmo
prune config

global-exclude __pycache__
global-exclude *.py[co]
21 changes: 0 additions & 21 deletions README.md

This file was deleted.

44 changes: 44 additions & 0 deletions README.rst
@@ -0,0 +1,44 @@
RDMO - Research Data Management Organiser
=========================================

.. image:: https://travis-ci.org/rdmorganiser/rdmo.svg?branch=master
:alt: Build Status
:target: https://travis-ci.org/rdmorganiser/rdmo

.. image:: https://coveralls.io/repos/rdmorganiser/rdmo/badge.svg?branch=master&service=github
:alt: Coverage Status
:target: https://coveralls.io/github/rdmorganiser/rdmo?branch=master

.. image:: https://img.shields.io/pypi/v/rdmo.svg?style=flat
:alt: Latest Version
:target: https://pypi.python.org/pypi/rdmo/

.. image:: https://readthedocs.org/projects/rdmo/badge/?version=latest
:alt: Documentation status
:target: http://rdmo.readthedocs.io/en/latest/?badge=latest

.. image:: http://img.shields.io/badge/license-APACHE-blue.svg?style=flat
:alt: License
:target: https://github.com/rdmorganiser/rdmo/blob/master/LICENSE

RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project. RDMO is funded by the Deutsche Forschungsgemeinschaft (DFG).

Home Page
https://rdmorganiser.github.io

Source code
https://github.com/rdmorganiser/rdmo

Documentation
http://rdmo.readthedocs.io

Mailing list
https://www.listserv.dfn.de/sympa/subscribe/rdmo

Slack
https://rdmo.slack.com

Demo
https://rdmo.aip.de

Warning: This software is currently under development and not production ready.
1 change: 0 additions & 1 deletion apps/accounts/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion apps/conditions/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion apps/domain/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion apps/options/__init__.py

This file was deleted.

130 changes: 0 additions & 130 deletions apps/options/tests.py

This file was deleted.

1 change: 0 additions & 1 deletion apps/projects/__init__.py

This file was deleted.

0 comments on commit 2c4463c

Please sign in to comment.