Update master from dev #164

hayfield · 2017-09-14T16:08:47Z

Might as well give it a go I s'pose.

Fix an IndexError in `date_order` test

Merge branch dev into specific-rule-types

This leads to problems with AtLeastOne

…ataset-renaming

Test dataset renaming

Test no context rules

… desirable

Specific rule types

syntax highlighting in README

In several cases, the same function call was being called multiple times when it didn't need to be. This is due to the values previously being a constant, then find+replace happening.

A single call to a local function is much nicer than a nested call to a pair of functions in a different module

Update `ruleset-implementation` with the latest changes from dev

…add whitespace

Less and more were confused due to copypaste error

Add check that data can be invalidated against the Standard Ruleset

Fix a copypaste error

Linting fixes

[requires.io] dependency update on dev branch

Since lxml v4.0.0, a bug has been resolved, where previously etree.fromstring() failed to parse UTF-32 data with BOM.

Add tests for raw datasets encoded in UTF-32

There were a few missing, and this makes ir future-proof

The intention is to have something to call 0.1.0 today

Add missing lxml to travis install

Update version number and release date in changelog - 0.1.0

hayfield · 2017-10-19T13:55:39Z

!!!!!!!

dalepotter · 2017-10-19T14:10:27Z

README.md

+# To create a Ruleset object from your ruleset_str:
+iati.Ruleset(ruleset_str)
+```
+
 **Note:** This functionality is not yet implemented.


Now you can use rulesets, this line can be deleted.

dalepotter · 2017-10-19T14:12:46Z

docs/source/iati.rst

    iati.tests

 Submodules
 ----------

+iati\.codelists module


In docs/source/iati.core.tests.rst, the \ characters have been removed, so not sure if the approach here is consistent...?

Also applies to other instances of submodule headings and instances in docs/source/iati.tests.rst.

Running make docs should fix this. If not, delete docs/build/, then re-run this.

...actually this is in docs/source/ - just run make docs and make sure any iati.core references have said turrah.

This was resolved in ce3b5e1.

dalepotter · 2017-10-19T14:22:45Z

iati/data.py

+
+    @property
+    def version(self):
+        """Return the version that this Dataset is specified against.


For clarity, should perhaps be 'Return the IATI version that this Dataset is specified against.'

It should be consistent with the standard documentation for a version parameter for functions (whatever that may be).

dalepotter · 2017-10-19T14:23:56Z

iati/default.py

+        version (str): The version of the Standard to return the Ruleset for. Defaults to None. This means that the latest Ruleset schema is returned.
+
+    Returns:
+        json: A JSON representation of the Ruleset schema for the specified version of the Standard.


json -> dict

dalepotter

A few fairly small things.

Fixes to review requests in #164

Imogen Kutz and others added 30 commits September 4, 2017 17:03

Merge pull request #128 from IATI/dateorder-no-element

0138203

Fix an IndexError in `date_order` test

Merge branch 'specific-rule-types' into test-dataset-renaming

05224ed

Merge branch 'specific-rule-types' into specific-rule-types-dev

5a0e5ae

Make tests work again

90730c8

Merge pull request #126 from IATI/specific-rule-types-dev

a372296

Merge branch dev into specific-rule-types

Merge branch 'specific-rule-types' into test-dataset-renaming

64627c7

Add missing import, add valid data

291f3c7

Add test for non-existant context

4bbf87d

This leads to problems with AtLeastOne

Fix AtLeastOne

7452d72

Merge remote-tracking branch 'origin/specific-rule-types' into test-d…

d30e074

…ataset-renaming

Merge pull request #130 from IATI/test-dataset-renaming

085bce0

Test dataset renaming

Fix a documentation copypaste error

9eb4693

Merge pull request #131 from IATI/test-no-context-rules

0f77705

Test no context rules

Fix Ruleset is_valid_for accepting falsey statement as False when not…

6085fef

… desirable

Merge pull request #124 from IATI/specific-rule-types

d5f9cf7

Specific rule types

syntax highlighting in README

2c45053

Merge pull request #133 from andylolz/patch-2

1abd54a

syntax highlighting in README

Merge branch dev into ruleset-implementation-dev

daa7d33

Create more 'xml_str' variables in test_data.py

94b97e2

In several cases, the same function call was being called multiple times when it didn't need to be. This is due to the values previously being a constant, then find+replace happening.

Utilise a utility function to simplify constant definitions

f32034d

A single call to a local function is much nicer than a nested call to a pair of functions in a different module

Merge pull request #134 from IATI/ruleset-implementation-dev

f4c1fc0

Update `ruleset-implementation` with the latest changes from dev

Add check that data can be invalidated against the Standard Ruleset, …

9f2f1cf

…add whitespace

Fix a copypaste error

3152d15

Less and more were confused due to copypaste error

Make Ruleset test files valid IATI XML

82451a4

Merge branch 'ruleset-implementation' into simplify-utility-constants

2839528

Merge pull request #138 from IATI/specific-rule-types

9326a4d

Add check that data can be invalidated against the Standard Ruleset

Merge pull request #139 from IATI/fix-rule-str-typo

a765907

Fix a copypaste error

Merge branch 'ruleset-implementation' into simplify-utility-constants

23d4786

Add a narrative element

5e8e98a

Refactor linting error

00b88e7

hayfield and others added 9 commits October 19, 2017 12:24

Merge pull request #180 from IATI/dev-2-master-lintin

b9c06da

Linting fixes

Merge branch 'dev' into requires-io-dev

d115e3f

Merge branch 'master' into dev

da1863f

Merge pull request #186 from IATI/requires-io-dev

137d08e

[requires.io] dependency update on dev branch

Add missing lxml to travis install

b5ca104

Add tests for raw datasets encoded in UTF-32

f76bcb6

Since lxml v4.0.0, a bug has been resolved, where previously etree.fromstring() failed to parse UTF-32 data with BOM.

Merge pull request #192 from IATI/add-tests-utf32-encoding

438b0de

Add tests for raw datasets encoded in UTF-32

Add all requirements to pylint travis check

d178005

There were a few missing, and this makes ir future-proof

Update version number and release date in changelog

4910034

The intention is to have something to call 0.1.0 today

hayfield mentioned this pull request Oct 19, 2017

Update version number and release date in changelog - 0.1.0 #193

Merged

hayfield added 2 commits October 19, 2017 14:42

Merge pull request #191 from IATI/add-missing-travis-install

e8135a1

Add missing lxml to travis install

Merge pull request #193 from IATI/update-to-0.1.0

5eec47f

Update version number and release date in changelog - 0.1.0

hayfield added complete A PR that is in a state that is ready for review. and removed incomplete A PR that is in a state that is not ready for review. labels Oct 19, 2017

dalepotter approved these changes Oct 19, 2017

View reviewed changes

dalepotter suggested changes Oct 19, 2017

View reviewed changes

hayfield added incomplete A PR that is in a state that is not ready for review. and removed complete A PR that is in a state that is ready for review. labels Oct 19, 2017

dalepotter added 4 commits October 19, 2017 15:50

Remove placeholder text for rulesets in README

6a860b5

Clarify documentation for iati.Dataset.version

e8fd3e2

Improve documentation for iati.default.ruleset_schema output

1902666

Modify docs names: iati.core -> pyIATI

ce3b5e1

dalepotter mentioned this pull request Oct 19, 2017

Fixes to review requests in #164 #194

Merged

dalepotter and others added 2 commits October 19, 2017 16:18

Fix missing word in docs sentance.

4cccce6

Merge pull request #194 from IATI/164-review-fixes

a503b81

Fixes to review requests in #164

dalepotter added complete A PR that is in a state that is ready for review. and removed incomplete A PR that is in a state that is not ready for review. labels Oct 19, 2017

dalepotter approved these changes Oct 19, 2017

View reviewed changes

hayfield merged commit cd992a1 into master Oct 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update master from dev #164

Update master from dev #164

hayfield commented Sep 14, 2017

hayfield commented Oct 19, 2017

dalepotter Oct 19, 2017

dalepotter Oct 19, 2017

dalepotter Oct 19, 2017

hayfield Oct 19, 2017

hayfield Oct 19, 2017

dalepotter Oct 19, 2017

dalepotter Oct 19, 2017

hayfield Oct 19, 2017

dalepotter Oct 19, 2017

dalepotter left a comment

Update master from dev #164

Update master from dev #164

Conversation

hayfield commented Sep 14, 2017

hayfield commented Oct 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dalepotter left a comment

Choose a reason for hiding this comment