To dts

[sonofmun]

No description provided.

[sonofmun]

@PonteIneptique I don't need a review here yet. But the tests that are not passing now have to do with fetching annotations. And I am not sure precisely what has changed and where. I will keep researching, but if you have a tip where to look, I would appreciate it.

[sonofmun]

Perhaps a bit more explanation here. The source of the difference is from https://github.com/Capitains/MyCapytain/blob/3ff0f27e514f5895d4f83dbe294d4035a9e4dc53/MyCapytain/resources/texts/local/capitains/cts.py#L235. This used to return an empty list but now it returns an error.
But even if I catch the error here

flask-capitains-nemo/flask_nemo/query/interface.py

Line 130 in 2e87aa2

if len(reffs) == 0:

(instead of just checking if the list of reffs is empty), then the TestSimpleQuery tests e.g.,

flask-capitains-nemo/tests/test_query/test_interface.py

Line 125 in 2e87aa2

self.assertEqual(annotations[0], self.four, "Deepest node should match as well")

still don't pass because the annotations is actually an empty list and thus annotation[0] throws an index error.

[PonteIneptique]

Matt, care to have a call this afternoon ?

[PonteIneptique]

If @balmas is available as well, that would be great.
I think we should drop annotations and other stuff, this might make your life easier.

[sonofmun]

Sure. I am available any time between 2pm and 5pm (so 7-10am eastern time).

[sonofmun]

FYI, with MyCapytain 3.0.0, the dts-draft-1 branch of Nautlius, and the to_DTS branch of flask-nemo, all of my unit tests work on formulae-capitains-nemo and everything seems to work locally as well.

[sonofmun]

I have solved the problem. The difference was that MyCapytain.resources.texts.local.capitains.cts.getValidReff returned simply a list of the passages before 3.0.0 (e.g., ['1.1', '1.2'...]) whereas now it returns a list of CtsReferenceSets, which are tuples. So that means that instead of a list of strings, what is returned is a list of tuples. And so that means that the lines that actually build the annotation list

flask-capitains-nemo/flask_nemo/query/interface.py

Lines 99 to 106 in 2e87aa2

	annotations.extend([
	annotation
	for annotation in self.annotations
	# Exact match
	if (str(objectId), subreference) == (annotation.target.objectId, annotation.target.subreference) or
	# Deeper match
	len(ref_in_range.intersection(annotation.target.expanded)) > 0
	])

would not match anything because ref_in_range.intersection(annotation.target.expanded) is never true (ref_in_range is made up of tuples and annotation.target.expanded of strings.
I will push a (very small) change here and then you @PonteIneptique can decide whether this makes sense or not.

[PonteIneptique]

I was actually having a look at it, and I am still not sure to understand why the first iteration on self.four yields 1.pr.1 as a target... Waiting for your commit then !

[PonteIneptique]

I think what you meant is getValidReff returns now CtsReferenceSet which are list of CtsReference which are tuple ?

[sonofmun]

That is correct. That is what I meant.

[PonteIneptique]

Have you tried to browse your current website using this version of nemo ?

[sonofmun]

I have. And everything works.

[PonteIneptique]

Ok, let me do some cosmetic change for one thing or two

[coveralls]

Coverage increased (+0.004%) to 98.494% when pulling d178c77 on to_DTS into 2e87aa2 on dev.

[sonofmun]

It is still testing 3.4.5?

[PonteIneptique]

Yup and it should not. Let me do it ;)

[sonofmun]

OK.

[sonofmun]

Coverage goes down because the line that I left in query/interface.py for backward compatibility is not tested.

flask-capitains-nemo/flask_nemo/query/interface.py

Lines 136 to 137 in 65516ed

	if len(reffs) == 0:
	break

Perhaps it can be removed since I have put MyCapytain>=3.0.0 in the requirements.txt?

[PonteIneptique]

Oh and maybe bump the Minor version :')

[sonofmun]

Now you tell me.

[sonofmun]

Should it be 1.1 instead of 1.0.4?

[PonteIneptique]

Yup, 1.1.0 is what I meant with minor ;)

[sonofmun]

I am not sure about the terminology there.
BTW, you know that this will be a breaking change, right?

[sonofmun]

The description of Nemo in setup.py is "Flask Extension to browse CTS Repository". Should I change this? Perhaps, "Flask Extension to browse a CapiTainS-compliant Repository"?

[PonteIneptique]

Good catch. Yes :)

[PonteIneptique]

Looks good to me !

[sonofmun]

Should we PR to master as well and do a 2.0.0 release?

[PonteIneptique]

Yes :') Le ven. 25 oct. 2019 à 12:48 PM, Matthew Munson <notifications@github.com> a écrit :

…

Should we PR to master as well and do a 2.0.0 release? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#126?email_source=notifications&email_token=AAOXEZTDGB6D7ZOUZTDIERDQQLFGJA5CNFSM4JDM5F52YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOECH7FZI#issuecomment-546304741>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAOXEZQ3SIS3KPZDKZC77PDQQLFGJANCNFSM4JDM5F5Q> .