Merge branch 'develop'

Author: skasberger

.gitignore

@@ -15,6 +15,7 @@ notes*.md
 stash*.*
 setup.sh
 .pypirc
+data/
 
 # Distribution / packaging
 build/

.travis.yml

@@ -20,8 +20,6 @@ matrix:
       env: TOXENV=coverage
     - python: 3.6
       env: TOXENV=coveralls
-    - python: 3.6
-      env: TOXENV=flake8
     - python: 3.6
       env: TOXENV=packaging
     - python: 3.6

HISTORY.md

@@ -1,6 +1,16 @@
 .. :changelog:
 
-0.1.0 - Marietta Blau (2019-05-20)
+0.2.0 - (2019-06-17) - Ida Pfeiffer
 ------------------------------------
 
-- First release on PyPI.
+[Release](https://github.com/AUSSDA/pyDataverse/releases/tag/v0.2.0)
+
+0.1.1 - (2019-05-28)
+------------------------------------
+
+[Release](https://github.com/AUSSDA/pyDataverse/releases/tag/v0.1.1)
+
+0.1.0 - (2019-05-20) - Marietta Blau
+------------------------------------
+
+[Release](https://github.com/AUSSDA/pyDataverse/releases/tag/v0.1.0)

README.md

@@ -1,18 +1,22 @@
-[![Build Status](https://travis-ci.com/AUSSDA/pyDataverse.svg?branch=master)](https://travis-ci.com/AUSSDA/pyDataverse) [![Coverage Status](https://coveralls.io/repos/github/AUSSDA/pyDataverse/badge.svg)](https://coveralls.io/github/AUSSDA/pyDataverse) [![Documentation Status](https://readthedocs.org/projects/pydataverse/badge/?version=latest)](https://pydataverse.readthedocs.io/en/latest) [![GitHub](https://img.shields.io/github/license/aussda/pydataverse.svg)](https://opensource.org/licenses/MIT)
+[![PyPI](https://img.shields.io/pypi/v/pyDataverse.svg)](https://pypi.org/project/pyDataverse/) [![Build Status](https://travis-ci.com/AUSSDA/pyDataverse.svg?branch=master)](https://travis-ci.com/AUSSDA/pyDataverse) [![Coverage Status](https://coveralls.io/repos/github/AUSSDA/pyDataverse/badge.svg)](https://coveralls.io/github/AUSSDA/pyDataverse) [![Documentation Status](https://readthedocs.org/projects/pydataverse/badge/?version=latest)](https://pydataverse.readthedocs.io/en/latest) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pydataverse.svg) [![GitHub](https://img.shields.io/github/license/aussda/pydataverse.svg)](https://opensource.org/licenses/MIT)
 
 # pyDataverse
 
-pyDataverse is a Python module for [Dataverse](http://dataverse.org/). It uses the [Native API](http://guides.dataverse.org/en/latest/api/native-api.html) and [Data Access API](http://guides.dataverse.org/en/latest/api/dataaccess.html). It allows to create, update and remove Dataverses, Datasets and Datafiles via Dataverse's native API. Thanks to the developers of [dataverse-client-python](https://github.com/IQSS/dataverse-client-python), from which the project got inspired from.
+pyDataverse is a Python module for [Dataverse](http://dataverse.org).
+It uses the [Dataverse API](http://guides.dataverse.org/en/latest/api/index.html)
+and it's metadata data model to import, manipulate and export Dataverses, Datasets
+and Datafiles.
 
 **Features**
 
-* Open Source ([MIT](https://opensource.org/licenses/MIT))
-* `api.py`: Dataverse Api functionalities to create, get, publish and delete Dataverses, Datasets and Datafiles.
-* `utils.py`: Functions to support the core functionalities.
-* `exceptions.py`: Custom exceptions
-* `tests/*`: Tests on [Travis CI](https://travis-ci.com/AUSSDA/pyDataverse) ([pytest](https://docs.pytest.org/en/latest/) + [tox](http://tox.readthedocs.io/)).
-* [Documentation](https://pydataverse.readthedocs.io/en/latest/)
+* Dataverse Api functionalities to create, get, publish and delete Dataverses, Datasets and Datafiles of your Dataverse instance via Api.
+* Dataverse metadata model for easy manipulation and data conversion from and to other formats (e. g. Dataverse Api metadata JSON).
+* Utils to support core functionalities.
+* Custom exceptions
+* Tests on [Travis CI](https://travis-ci.com/AUSSDA/pyDataverse) ([pytest](https://docs.pytest.org/en/latest/) + [tox](http://tox.readthedocs.io/)).
+* [Documentation](https://pydataverse.readthedocs.io/en/latest/) (Sphinx, ReadTheDocs)
 * Python 2 and 3 (>=2.7)
+* Open Source ([MIT](https://opensource.org/licenses/MIT))
 
 **Copyright**
 

setup.py

@@ -53,7 +53,7 @@ def run_tests(self):
 INSTALL_REQUIREMENTS = [
     # A string or list of strings specifying what other distributions need to
     # be installed when this one is.
-    'requests'
+    'requests>=2.12.0'
 ]
 
 SETUP_REQUIREMENTS = [

src/pyDataverse/__init__.py

@@ -16,7 +16,7 @@
 __email__ = 'stefan.kasberger@univie.ac.at'
 __copyright__ = 'Copyright (c) 2019 Stefan Kasberger'
 __license__ = 'MIT License'
-__version__ = '0.1.1'
+__version__ = '0.2.0'
 __url__ = 'https://github.com/AUSSDA/pyDataverse'
 __download_url__ = 'https://pypi.python.org/pypi/pyDataverse'
-__description__ = 'A Python wrapper around the Dataverse API'
+__description__ = 'A Python module for Dataverse.'