eynollah icon indicating copy to clipboard operation
eynollah copied to clipboard

Revert "Merge pull request #97 from qurator-spk/420-namespace-package"

Open bertsky opened this issue 2 years ago • 7 comments

This reverts commit fd56b86acf55677dc7a8bfb9e2737c3cc167327a, reversing changes made to ea792d1e4ac4a722770b82dc91e71f84d5beb212.

This is the second attempt, same reasoning as in #107 (creating an upstream ref for ocrd_all), but different target: We want to avoid #86 (entirely), but also #97. We cannot just revert to v0.2.0 though, because we do need #100. So this is #100 plus a revert of #97.

bertsky avatar Jun 10 '23 20:06 bertsky

This is already merged it seems.

mikegerber avatar Aug 17 '23 18:08 mikegerber

Yes, the changes introduced by this PR so far are all in main already - but also the PR is still marked as draft.

@bertsky what do you consider the status of this?

cneud avatar Aug 17 '23 23:08 cneud

Oh my... confusion on all levels!

This is already merged it seems.

No, it's not. You can clearly see a diff here.

Also, it's not even meant to be merged (only provide a reference for ocrd_all as long as problems caused by #86 and #97 are not fixed on main), hence the draft status. See reasoning in #107.

Yes, the changes introduced by this PR so far are all in main already - but also the PR is still marked as draft.

@bertsky what do you consider the status of this?

Again: #86 is broken for OCR-D. So is #97. But we still do need #100 (which obviously came later). So this is effectively a state before #86 plus cherry-picked #100.

bertsky avatar Aug 18 '23 10:08 bertsky

@bertsky I see...sorry for the confusion and thanks for clarifying (again).

cneud avatar Aug 18 '23 12:08 cneud

Unfortunately, I'll have to add new changes to this PR, which will likely be needed on master as well: Since https://github.com/OCR-D/core/pull/1079, we must correctly distinguish between local_filename and url.

If all else fails, please consider just cherry-picking from here on.

bertsky avatar Jan 19 '24 16:01 bertsky

Moreover, since @kba says local_filename will now officially be : Path, we need yet another fix here.

bertsky avatar Jan 24 '24 18:01 bertsky

I think I have cherry-picked all the commits to #130

kba avatar Aug 24 '24 17:08 kba

Superseded by #130 and merged in #150.

kba avatar Apr 07 '25 14:04 kba