Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

taxonomy: flaxseed fiber #6945

Merged
merged 11 commits into from
Jul 15, 2022
Merged

taxonomy: flaxseed fiber #6945

merged 11 commits into from
Jul 15, 2022

Conversation

moon-rabbitOFF
Copy link
Contributor

No description provided.

@moon-rabbitOFF moon-rabbitOFF added 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies categories labels Jun 23, 2022
Copy link
Contributor

@yuktea yuktea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for adding this! The PR seems to be failing the unit-tests. We should look into why before merging

@yuktea yuktea self-requested a review June 23, 2022 18:03
@@ -81685,18 +81714,25 @@ sv:falafel
wikidata:en:Q188788
wikipedia:en:https://en.wikipedia.org/wiki/Falafel

# don't put fruit concentrate in fruit
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not? It would seem reasonable to say that if a product contains fruit concentrate, it contains fruit I think. It's just a guess, but isn't fruit concentrate just fruit with less water?

@stephanegigandet
Copy link
Contributor

stephanegigandet commented Jun 24, 2022

@yuktea details about why the unit test is failing:

#   Failed test at t/ingredients_percent.t line 812.
#     Structures begin differing at:
#          $got->[1]{id} = 'en:fruit-concentrate'
#     $expected->[1]{id} = 'en:fruit-concentrates'

@moon-rabbitOFF : we already had a "fruit concentrates" entry (the canonical name should indeed be "fruit concentrate" ).

Can you merge it into the entry you added?

<en:fruit
en:fruit concentrates
de:Früchtekonzentrate
es:concentrados de fruta, concentrados de frutas
fi:hedelmätiivisteet
fr:concentrés de fruits
it:concentrati di frutta
nl:fruitconcentraat
# openfoodfacts:https://world.openfoodfacts.org/ingredient/fr:concentrés-de-fruits
# 42 products in 3 languages @2018-10-04

<en:plant
en:plant concentrates
da:plantekoncentrater
de:pflanzenkonzentrate
es:concentrados de plantas, concentrados vegetales
fi:kasvitiivisteet, kasvitiiviste
fr:concentrés de plantes
it:Concentrati vegetali
nl:plantconcentraat, plantconcentraten
sv:växtkoncentrat, plantkoncentrat

@stephanegigandet stephanegigandet changed the title flaxseed fiber taxonomy: flaxseed fiber Jun 30, 2022
@alexgarel
Copy link
Member

There are some failing tests that needs to be adjusted:

2022-06-29T16:12:21.8897096Z #   Failed test at t/ingredients_analysis.t line 67.
2022-06-29T16:12:21.8904611Z #     Structures begin differing at:
2022-06-29T16:12:21.8905479Z #          $got->[1] = 'en:vegan-status-unknown'
2022-06-29T16:12:21.8906460Z #     $expected->[1] = 'en:vegan'
2022-06-29T16:12:21.8906718Z # {
2022-06-29T16:12:43.7134463Z 
2022-06-29T16:12:43.7134936Z #   Failed test at t/ingredients_percent.t line 812.
2022-06-29T16:12:43.7138862Z #     Structures begin differing at:
2022-06-29T16:12:43.7139770Z #          $got->[1]{id} = 'en:fruit-concentrate'
2022-06-29T16:12:43.7140394Z #     $expected->[1]{id} = 'en:fruit-concentrates'
2022-06-29T16:12:43.7140719Z [
2022-06-29T16:12:43.7236173Z 
2022-06-29T16:12:43.7236546Z #   Failed test at t/ingredients_percent.t line 812.
2022-06-29T16:12:43.7240118Z #     Structures begin differing at:
2022-06-29T16:12:43.7240994Z #          $got->[1]{id} = 'en:fruit-concentrate'
2022-06-29T16:12:43.7241533Z #     $expected->[1]{id} = 'en:fruit-concentrates'
2022-06-29T16:12:43.7245713Z [

@github-actions github-actions bot added the 💥 Merge Conflicts 💥 Merge Conflicts label Jul 13, 2022
@stephanegigandet
Copy link
Contributor

@moon-rabbitOFF I'm fixing the tests etc. I'll add "vegetable protein" as a synonym of "plant protein"

@github-actions github-actions bot removed the 💥 Merge Conflicts 💥 Merge Conflicts label Jul 13, 2022
@moon-rabbitOFF moon-rabbitOFF requested a review from a team as a code owner July 13, 2022 14:38
@github-actions github-actions bot added 🧬 Taxonomies - Rebuild Taxonomies are compiled before they can be used. 🧪 tests labels Jul 13, 2022
@sonarcloud
Copy link

sonarcloud bot commented Jul 13, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@stephanegigandet stephanegigandet merged commit 075be82 into main Jul 15, 2022
@stephanegigandet stephanegigandet deleted the flaxseed-fiber branch July 15, 2022 12:47
dipietroR added a commit that referenced this pull request Jul 18, 2022
* refactor: adding perltidy to t/lang.t (#7044)

Implementing perltidy to t/lang.t , will have a merge conflict with PR
6085

* taxonomy: add new Polish translations (#7068)

* Polish translations of meat

* add additinal polish translations of popular ingredients

* taxonomy: Corrections to cheeses (#7065)

Update categories.txt

* refactor: adding perltidy to files (#7070)

Implementing perltidy to t/dataquality.t , t/dataqualityfood.t , t/export.t

* taxonomy: flaxseed fiber (#6945)

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* update taxonomy and tests

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>

* docs: Add how-to for remote dev (Gitpod) (#7053)

* docs: Add how-to for remote dev (Gitpod)
* docs: Add references/badges for gitpod environments

* feat: Nutrient levels knowledge panels with facts and recommendations (#6980)

* feat: knowledge panels for nutrient levels #6947

* add quantity in nutrient panel title

* facts + recommendations for salt

* fixed conflict

* add info and recommendations for sugars, fat and saturated fat

* fix: fix vitamin b1 thiamin %DV  (#7072)

fix: fix vitamin b1 thiamin %DV #6882

* refactor: updating perl critic

Changing the perl critic config file to make it easier to pick and
choose what tests will run.

* feat: perlcritic unused variables check

* refactor: perlcritic github testing

* fetch depth

* add perlcritic

* better error message

* all errors

* allow ProductOpener::PerlStandards

* remove undef

* comment out severity 3

Commented outunused variable, severity 3 so that there are less merge
conflicts when implementing perltidy to files.

* refactor: dont look into .git directory

Making sure that perlcritic doesn't look into .git directory

* adding perlcritic to Makefile

* moving perlcritic to pull_request.yml

* default for perlcritic

* refactor: uncomment severity 3

* refactor: removing unused variables

Co-authored-by: Teiron <12804636+Teiron@users.noreply.github.com>
Co-authored-by: moon-rabbitOFF <34795011+moon-rabbitOFF@users.noreply.github.com>
Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>
Co-authored-by: Tushar <ditsuke@protonmail.com>
alexgarel pushed a commit that referenced this pull request Jul 19, 2022
* refactor: adding perltidy to t/lang.t (#7044)

Implementing perltidy to t/lang.t , will have a merge conflict with PR
6085

* taxonomy: add new Polish translations (#7068)

* Polish translations of meat

* add additinal polish translations of popular ingredients

* taxonomy: Corrections to cheeses (#7065)

Update categories.txt

* refactor: adding perltidy to files (#7070)

Implementing perltidy to t/dataquality.t , t/dataqualityfood.t , t/export.t

* taxonomy: flaxseed fiber (#6945)

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* update taxonomy and tests

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>

* docs: Add how-to for remote dev (Gitpod) (#7053)

* docs: Add how-to for remote dev (Gitpod)
* docs: Add references/badges for gitpod environments

* feat: Nutrient levels knowledge panels with facts and recommendations (#6980)

* feat: knowledge panels for nutrient levels #6947

* add quantity in nutrient panel title

* facts + recommendations for salt

* fixed conflict

* add info and recommendations for sugars, fat and saturated fat

* fix: fix vitamin b1 thiamin %DV  (#7072)

fix: fix vitamin b1 thiamin %DV #6882

* refactor: updating perl critic

Changing the perl critic config file to make it easier to pick and
choose what tests will run.

* feat: perlcritic unused variables check

* refactor: perlcritic github testing

* fetch depth

* add perlcritic

* better error message

* all errors

* allow ProductOpener::PerlStandards

* remove undef

* comment out severity 3

Commented outunused variable, severity 3 so that there are less merge
conflicts when implementing perltidy to files.

* refactor: dont look into .git directory

Making sure that perlcritic doesn't look into .git directory

* adding perlcritic to Makefile

* moving perlcritic to pull_request.yml

* default for perlcritic

* refactor: uncomment severity 3

* refactor: removing unused variables

Co-authored-by: Teiron <12804636+Teiron@users.noreply.github.com>
Co-authored-by: moon-rabbitOFF <34795011+moon-rabbitOFF@users.noreply.github.com>
Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>
Co-authored-by: Tushar <ditsuke@protonmail.com>
LandonPattison pushed a commit that referenced this pull request Jul 24, 2022
* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* update taxonomy and tests

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>
LandonPattison pushed a commit that referenced this pull request Jul 25, 2022
* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* update taxonomy and tests

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>
LandonPattison pushed a commit that referenced this pull request Jul 25, 2022
* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* update taxonomy and tests

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>
LandonPattison pushed a commit that referenced this pull request Jul 25, 2022
* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* Update ingredients.txt

* update taxonomy and tests

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🥗 Ingredients 🧬 Taxonomies - Rebuild Taxonomies are compiled before they can be used. 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies 🧪 tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants