From 03946ec40c423c8ace8cb93d05fbeffc43107bb7 Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Wed, 13 Feb 2019 15:51:16 +0100 Subject: [PATCH 1/5] [travis] Remove py3.4 build Removing Python 3.4 since support for it is discontinued by March 2019. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b80df52..ea3495ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ matrix: - os: linux python: "2.7" env: COVERALLS=1 - - os: linux - python: "3.4" - os: linux python: "3.5" - os: linux From 530ad3d68bc46ee883bdfccc7ecdf36d2937c678 Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Wed, 13 Feb 2019 16:29:39 +0100 Subject: [PATCH 2/5] [Contributing] Typo fix and review update --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c1cbafc1..8c496011 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ Governance model The project has a core team of **maintainers** who are long-term contributors and responsible for coordinating the project. There is also a set of one-time or short period **contributors**. We consider everyone a contributor who reports issues, opens pull requests, or takes part in issue discussions. Any such contribution is welcome. Maintainers have commit access to the repository and will review and merge pull requests. Becoming a maintainer is possible for everyone who wants to help maintaining and shaping the project and to take over more responsibility. Requests to become a maintainer need to be approved by the existing maintainers. -Any addition to the code happens via pull requests (there are only very few exceptions in which someone pushes directly to master, see below for more information). Thus, any contribution will be reviewed before it is merged. Bug fixes and other contributions to the API will undergo this pragmatic approach. Format or API changes, especially those that would lead to breaking changes, will be discussed via the issue tracker and video meetings and need to be agreed on by the maintainters. We aim at consensus decisions, but where this is not possible decisions are made by majority vote among the maintainers. +Any addition to the code happens via pull requests (there are only very few exceptions in which someone pushes directly to master, see below for more information). Thus, any contribution will be reviewed before it is merged. Bug fixes and other contributions to the API will undergo this pragmatic approach. Format or API changes, especially those that would lead to breaking changes, will be discussed via the issue tracker and video meetings and need to be agreed on by the maintainers. We aim at consensus decisions, but where this is not possible decisions are made by majority vote among the maintainers. Contributing @@ -67,12 +67,12 @@ Each pull request that passes all builds and tests should be reviewed by at leas If a contribution is rather complex or leads to significant API changes, the respective pull request should be reviewed by two other developers. In such cases the first reviewer or the contributor should request a second review in a comment. - +To streamline the review process reviewers are encouraged to use the github "review" option. Testing ------- -* Unit test can be found in the test sub directory. Currently, the test coverage is a bit low but we are working on improving it. +* Unit tests can be found in the test sub directory. Currently, the test coverage is a bit low but we are working on improving it. * Provide a unit test for every class, method or function. From 6a1d794ba5e9ba53afaa20724784c80a27de007e Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Wed, 13 Feb 2019 16:54:18 +0100 Subject: [PATCH 3/5] [README] Update appveyor badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 486a16a6..ccb58ba1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Travis build](https://travis-ci.org/G-Node/python-odml.svg?branch=master) -![Appveyor](https://ci.appveyor.com/api/projects/status/2wfvsu7boe18kwjy?svg=true) +[![Build status](https://ci.appveyor.com/api/projects/status/br7pe6atlwdg5618/branch/master?svg=true)](https://ci.appveyor.com/project/G-Node/python-odml/branch/master) ![Test coverage](https://coveralls.io/repos/github/G-Node/python-odml/badge.svg?branch=master) # odML (Open metaData Markup Language) core library From aaae2e2fc34eb23e300edf6c5d2d5ca586a0e7a9 Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Wed, 13 Feb 2019 17:03:53 +0100 Subject: [PATCH 4/5] [travis] Set pyyaml version on osx build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea3495ff..fd0fa330 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ install: export PIPCMD=pip; fi; - - $PIPCMD install lxml enum34 pyyaml rdflib + - $PIPCMD install lxml enum34 pyyaml==4.2b4 rdflib script: - which $PYCMD From f855f9b2224850ec583ee0122cbf5094573b51dc Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Wed, 13 Feb 2019 17:04:56 +0100 Subject: [PATCH 5/5] [setup] Upgrade pyyaml dependency Closes #291 With pyyaml version 4.2+ the breaking changes of version 4.1 have been amended. Setting a specific pyyaml version since all currently 4.2* released versions are beta making an unspecific pip install unavailable. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 31cb9b50..3dbb5221 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ with open('README.md') as f: description_text = f.read() -install_req = ["lxml", "pyyaml==3.13", "rdflib", "docopt", "pathlib"] +install_req = ["lxml", "pyyaml==4.2b4", "rdflib", "docopt", "pathlib"] if sys.version_info < (3, 4): install_req += ["enum34"]