From edba50bdadd52b0c735380a0a9fd218beb434645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 17:42:03 -0300 Subject: [PATCH 1/9] Release v0.0.1 --- requirements_dev.txt | 2 +- setup.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index 0fa1113..182e549 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -9,4 +9,4 @@ Sphinx==1.4.8 cryptography==1.4 PyYAML==3.11 nose -recommonmark==0.5.4 +recommonmark diff --git a/setup.py b/setup.py index 985faf5..bb33732 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='pydatajson', - version='0.1.0', + version='0.0.1', description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.", long_description=readme + '\n\n' + history, author="Datos Argentina", @@ -39,12 +39,7 @@ 'License :: OSI Approved :: MIT License', 'Natural Language :: English', "Programming Language :: Python :: 2", - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', ], test_suite='tests', tests_require=test_requirements From 2453fde8b5fa694e50f0763e9b97d33073a1b818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 17:44:25 -0300 Subject: [PATCH 2/9] =?UTF-8?q?Agrego=20contrase=C3=B1a=20encriptada=20par?= =?UTF-8?q?a=20auto-deploy=20con=20Travis=20CI.=20Release=20v0.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 48 +++++++++++++++++++----------------------------- Makefile | 8 ++++---- setup.py | 2 +- 3 files changed, 24 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78a01ea..2e4d86c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,22 @@ -# Config file for automatic testing at travis-ci.org -# This file will be regenerated if you run travis_pypi_setup.py - -language: python -python: 3.5 - -env: - - TOXENV=py35 - - TOXENV=py34 - - TOXENV=py33 - - TOXENV=py27 - - TOXENV=py26 - - TOXENV=pypy - -# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors -install: pip install -U tox - -# command to run tests, e.g. python setup.py test -script: tox -e ${TOXENV} - -# After you create the Github repo and add it to Travis, run the -# travis_pypi_setup.py script to finish PyPI deployment setup +# This file was autogenerated and will overwrite each time you run travis_pypi_setup.py deploy: - provider: pypi + true: + condition: $TOXENV == py27 + repo: datosgobar/pydatajson + tags: true distributions: sdist bdist_wheel - user: datosgobar password: - secure: PLEASE_REPLACE_ME - on: - tags: true - repo: datosgobar/pydatajson - condition: $TOXENV == py27 + secure: DxjG/q7BPmslp22ISFrFhzW0my1M0lQLPojqY//98TLm2xQuJvJZWS/4Hzwg9yLbQO6G+9KuZWPDHFZbo77FoGwPEmDCUOSl7MQYprK2qgZDmyEpMk4LPRDR1kObaVM16ykiZtxPfKrHHLrWdUegheQPrEPY4JZ1CST47lNaVO8bDDKde1cBCoJGRiRiX+gzRfhoymjYSYsO8ZfZOkuaI/TUmbUea6l77R4tb3+m/kgeb0WMI406x9uzrn6YBZZ4i3Bo6xtteLNtSV2McENSfGnA0dzQ3XUTxq4fOD9XlK153DZKIPjdFuuvujxCI8/YdVhmFdtR9RY4hs4lYrVInn4/tDrlOWAQrATzBtLGnZg6meixzk3+Ks6nVaYnu8ehh+dchx05i28GJ4yPstbuV9cvoSgBbG7yUj3H9vhb3CYaClM8R36nz7IKmUKfhyZk75lQK67gbCITEURyN5FUOsWgjZcqF7XVDGgseoPSed7L/qip9hi7XPBlf0KvXCtkt7UTJojgwE47dR0KFkBxkWWOZ6/2tESsBm79O7DubVp1y451ibGK/oPk5C2vqFK4Hj9g7yc0syKUwwEk7TnF0m8VaCXnSJiCyRMiKNilcx+PxPNoFQoGEBDMyAuUp9hRCt4XVWjuAQbs125RCcFEAdsgznn92INf3nrnFnONFpo= + provider: pypi + user: datosgobar +env: +- TOXENV=py35 +- TOXENV=py34 +- TOXENV=py33 +- TOXENV=py27 +- TOXENV=py26 +- TOXENV=pypy +install: pip install -U tox +language: python +python: 3.5 +script: tox -e ${TOXENV} diff --git a/Makefile b/Makefile index f264c84..504cc06 100644 --- a/Makefile +++ b/Makefile @@ -51,16 +51,16 @@ lint: ## check style with flake8 flake8 pydatajson tests test: ## run tests quickly with the default Python - + python setup.py test test-all: ## run tests on every Python version with tox tox coverage: ## check code coverage quickly with the default Python - + coverage run --source pydatajson setup.py test - + coverage report -m coverage html $(BROWSER) htmlcov/index.html @@ -94,5 +94,5 @@ register: ## register the package to PyPi python setup.py register pypi: ## register the package to PyPi get travis ready to deploy to pip - python setup.py register + # python setup.py register python travis_pypi_setup.py diff --git a/setup.py b/setup.py index bb33732..e7d041e 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='pydatajson', - version='0.0.1', + version='0.0.2', description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.", long_description=readme + '\n\n' + history, author="Datos Argentina", From e0f1976e05360b085e2da46fb363c1365107faf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 17:48:26 -0300 Subject: [PATCH 3/9] =?UTF-8?q?Corrijo=20configuraci=C3=B3n=20del=20Travis?= =?UTF-8?q?=20CI,=20eliminando=20TOX=20y=20otros.=20Release=20v0.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 31 ++++++++++++++++++++----------- setup.py | 2 +- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e4d86c..e80289f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ # This file was autogenerated and will overwrite each time you run travis_pypi_setup.py +after_success: +- travis-sphinx deploy +- coveralls deploy: true: - condition: $TOXENV == py27 repo: datosgobar/pydatajson tags: true distributions: sdist bdist_wheel @@ -9,14 +11,21 @@ deploy: secure: DxjG/q7BPmslp22ISFrFhzW0my1M0lQLPojqY//98TLm2xQuJvJZWS/4Hzwg9yLbQO6G+9KuZWPDHFZbo77FoGwPEmDCUOSl7MQYprK2qgZDmyEpMk4LPRDR1kObaVM16ykiZtxPfKrHHLrWdUegheQPrEPY4JZ1CST47lNaVO8bDDKde1cBCoJGRiRiX+gzRfhoymjYSYsO8ZfZOkuaI/TUmbUea6l77R4tb3+m/kgeb0WMI406x9uzrn6YBZZ4i3Bo6xtteLNtSV2McENSfGnA0dzQ3XUTxq4fOD9XlK153DZKIPjdFuuvujxCI8/YdVhmFdtR9RY4hs4lYrVInn4/tDrlOWAQrATzBtLGnZg6meixzk3+Ks6nVaYnu8ehh+dchx05i28GJ4yPstbuV9cvoSgBbG7yUj3H9vhb3CYaClM8R36nz7IKmUKfhyZk75lQK67gbCITEURyN5FUOsWgjZcqF7XVDGgseoPSed7L/qip9hi7XPBlf0KvXCtkt7UTJojgwE47dR0KFkBxkWWOZ6/2tESsBm79O7DubVp1y451ibGK/oPk5C2vqFK4Hj9g7yc0syKUwwEk7TnF0m8VaCXnSJiCyRMiKNilcx+PxPNoFQoGEBDMyAuUp9hRCt4XVWjuAQbs125RCcFEAdsgznn92INf3nrnFnONFpo= provider: pypi user: datosgobar -env: -- TOXENV=py35 -- TOXENV=py34 -- TOXENV=py33 -- TOXENV=py27 -- TOXENV=py26 -- TOXENV=pypy -install: pip install -U tox +matrix: + allow_failures: + - python: '2.6' + - python: '3.4' + - python: pypy +install: +- pip install -r requirements.txt +- pip install -r requirements_dev.txt +- pip install python-coveralls +- pip install coveralls language: python -python: 3.5 -script: tox -e ${TOXENV} +python: +- '2.7' +script: +- nosetests --with-coverage +- travis-sphinx --source=docs -n build +sudo: false + diff --git a/setup.py b/setup.py index e7d041e..4a66c81 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='pydatajson', - version='0.0.2', + version='0.0.3', description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.", long_description=readme + '\n\n' + history, author="Datos Argentina", From ceb1d71ca07474c2e2b20187a746b885564dd578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 17:50:51 -0300 Subject: [PATCH 4/9] Agrego un requirement. v0.0.4 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index e69de29..d89304b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1 @@ +jsonschema From 72003eeee59e4f5e38ddd4ed7cfff9a599a05a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 17:51:10 -0300 Subject: [PATCH 5/9] Release v0.0.4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4a66c81..8e94c5f 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='pydatajson', - version='0.0.3', + version='0.0.4', description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.", long_description=readme + '\n\n' + history, author="Datos Argentina", From b312e22ac8e7dc67eda76fb79e4dd7cc220d1e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 17:53:57 -0300 Subject: [PATCH 6/9] =?UTF-8?q?Elimino=20build=20de=20documentaci=C3=B3n?= =?UTF-8?q?=20por=20ahora.=20Release=20v0.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e80289f..973c8f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ # This file was autogenerated and will overwrite each time you run travis_pypi_setup.py after_success: -- travis-sphinx deploy +# - travis-sphinx deploy - coveralls deploy: true: @@ -26,6 +26,6 @@ python: - '2.7' script: - nosetests --with-coverage -- travis-sphinx --source=docs -n build +# - travis-sphinx --source=docs -n build sudo: false diff --git a/setup.py b/setup.py index 8e94c5f..f98d9ab 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='pydatajson', - version='0.0.4', + version='0.0.5', description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.", long_description=readme + '\n\n' + history, author="Datos Argentina", From cd4f5593598c2306797d65789d9e316fa78aad5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 18:03:59 -0300 Subject: [PATCH 7/9] Agrego twine como forma de subir el primer paquete a PyPi. Release v0.0.6 --- Makefile | 2 +- requirements_dev.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 504cc06..edeba64 100644 --- a/Makefile +++ b/Makefile @@ -94,5 +94,5 @@ register: ## register the package to PyPi python setup.py register pypi: ## register the package to PyPi get travis ready to deploy to pip - # python setup.py register + twine upload dist/* python travis_pypi_setup.py diff --git a/requirements_dev.txt b/requirements_dev.txt index 182e549..1db440a 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -10,3 +10,4 @@ cryptography==1.4 PyYAML==3.11 nose recommonmark +twine From bf83288ae4a0d31202195894f1e6f9ebd855e157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 18:04:55 -0300 Subject: [PATCH 8/9] Release v0.0.7 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f98d9ab..edee16b 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='pydatajson', - version='0.0.5', + version='0.0.7', description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.", long_description=readme + '\n\n' + history, author="Datos Argentina", From 858cdcdc7f4961e008cd037d03982a9a09fc9468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Wed, 23 Nov 2016 18:18:09 -0300 Subject: [PATCH 9/9] Actualizo README y re-deploy a pypi para que funcione coveralls. Release v0.0.8. --- README.md | 17 +++++++++++++++-- setup.py | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a372c03..15fdb12 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,26 @@ Paquete en python con herramientas para generar y validar metadatos de catálogo ```python from pydatajson import DataJson -dj = DataJson("path/to/data.json") -validation_result = dj.is_valid_structure() +dj = DataJson() +validation_result = dj.is_valid_catalog("path/to/data.json") print validation_result True ``` +Con ejemplos del repositorio + +```python +validation_result = dj.is_valid_catalog("tests/samples/full_data.json") +print validation_result +True + +validation_result = dj.is_valid_catalog( + "tests/samples/missing_catalog_title_data.json") +print validation_result +False +``` + ## Tests *AYUDA: ¿Cómo correr los tests? ¿Cómo me instalo dependencias para los tests?* diff --git a/setup.py b/setup.py index edee16b..a2682b8 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='pydatajson', - version='0.0.7', + version='0.0.8', description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.", long_description=readme + '\n\n' + history, author="Datos Argentina",