aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-22Disable unused Python 2 variant. am: e90ad5e404 am: 7e6e982b8e am: ↵HEADandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseKrzysztof Kosiński
e679be899e am: 262cd32148 am: d4a98eff82 Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2221305 Change-Id: I3e8715e537558f33365818765af244332174ecf7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22Disable unused Python 2 variant. am: e90ad5e404 am: 7e6e982b8e am: ↵android-u-beta-1-gplmain-16k-with-phonesKrzysztof Kosiński
e679be899e am: 262cd32148 Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2221305 Change-Id: I1158ef43db417f7e5c180102addcbc63ae350d5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Disable unused Python 2 variant. am: e90ad5e404 am: 7e6e982b8e am: e679be899eKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2221305 Change-Id: Idb9d993235ec92ed80c45e97d499f2c49d9672bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Disable unused Python 2 variant. am: e90ad5e404 am: 7e6e982b8eKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2221305 Change-Id: I19a7a111a69eadc8bc333e6f6b4a23f02ce16b19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Disable unused Python 2 variant. am: e90ad5e404Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2221305 Change-Id: I8ad0c088e46d61df7fabc25ec123975e2dddb5f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Disable unused Python 2 variant.main-16kKrzysztof Kosiński
Bug: 245854393 Test: presubmit Change-Id: I1d69aa743020de1571c68ad15840ceadea91ece9
2022-09-16Move py-cachetools to src folder am: c9b01f8f0f am: e0f6cd8182 am: ↵Cole Faust
1036d9ce78 am: cfc2910233 am: 41143aa793 Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2219104 Change-Id: Iee4837e7a07eb73fce138e92c6e17e7de28a96cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16Move py-cachetools to src folder am: c9b01f8f0f am: e0f6cd8182 am: ↵Cole Faust
1036d9ce78 am: cfc2910233 Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2219104 Change-Id: If92bb6fef8604faa21139823bbee7b35009a79a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16Move py-cachetools to src folder am: c9b01f8f0f am: e0f6cd8182 am: 1036d9ce78Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2219104 Change-Id: Id8cac2cd6f975bcd9f84effe453a087cf1c1aa67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16Move py-cachetools to src folder am: c9b01f8f0f am: e0f6cd8182Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2219104 Change-Id: I9acbb1ceb4b7591e7e715c45ce29c1d436e94a86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16Move py-cachetools to src folder am: c9b01f8f0fCole Faust
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/2219104 Change-Id: Icf306eb2a9e180db73105bef6f26b92e78465a39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15Move py-cachetools to src folderCole Faust
When soong packages python files into a zip file, it will take their path relative to the Android.bp file and preserve that relative path in the zip file. Then the root directory of the zip file is added to the PYTHONPATH. Currently, all subdirectories of the top level zip directory are also added to the PYTHONPATH, but we want to remove this. Since cachetools was being added to the zip file under src/cachetools, "import cachetools" works currectly, but won't work after the PYTHONPATH changes (you'd have to say "import src.cachetools"). To fix this, move the Android.bp file for py-cachetools into the src folder, so the relative paths don't contain src/. Soong python modules do have a pkg_path attribute, which essentially adds more folders to the relative path, but we would need an attribute that removes them, which doesn't exist. This could also be done with a filegroup with the "path" attribute, but bp2build doesn't support that, so I opted to go with this option instead. Bug: 245583294 Test: Presubmits Change-Id: I47d3e743d91f8ac4506ce2f7395ed8c5905d988a
2022-02-11[automerger skipped] Empty merge of ↵t_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_wif_331910020aml_wif_331810010aml_wif_331710030aml_wif_331613000aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_tet_331910040aml_tet_331820050aml_tet_331711040aml_tet_331511160aml_tet_331511000aml_tet_331412030aml_tet_331312080aml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150aml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000aml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010aml_sch_331113000aml_sch_331111000aml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000aml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030aml_neu_331310000aml_neu_331113000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020aml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020aml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020aml_doc_331120000aml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010aml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000aml_adb_331610000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-wifi-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-tethering-releaseandroid13-mainline-sdkext-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-resolv-releaseandroid13-mainline-permission-releaseandroid13-mainline-os-statsd-releaseandroid13-mainline-networking-releaseandroid13-mainline-mediaprovider-releaseandroid13-mainline-media-swcodec-releaseandroid13-mainline-media-releaseandroid13-mainline-ipsec-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-extservices-releaseandroid13-mainline-conscrypt-releaseandroid13-mainline-cellbroadcast-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-mainline-adbd-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2b7f1ef3a5 -s ours am: 8a5705fa7c -s ours am skip reason: Merged-In I48a74533dde2264dd5d3c16fa40e8ea5853edd2e with SHA-1 0f42fa9982 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cachetools/+/16843727 Change-Id: I2dd3f681340a50a1cab60575a7bb49533b7d06f3
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2b7f1ef3a5 -s ours am skip reason: Merged-In I48a74533dde2264dd5d3c16fa40e8ea5853edd2e with SHA-1 0f42fa9982 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cachetools/+/16843727 Change-Id: Ide41d9a6f19d89bab2f65610c94fb1841c522bfd
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I48a74533dde2264dd5d3c16fa40e8ea5853edd2e Change-Id: I18e93a6f4442e7808bce57bf530a567cb4e2bc66
2022-01-28[LSC] Add LOCAL_LICENSE_KINDS to external/python/cachetools am: a0eafbe930 ↵Bob Badour
am: c0bc8e81d3 am: c542170b4b am: 24b24baf71 Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/1963802 Change-Id: I3d6553e2929971cc80abc690ca50afdec366d6f5
2022-01-28[LSC] Add LOCAL_LICENSE_KINDS to external/python/cachetools am: a0eafbe930 ↵Bob Badour
am: c0bc8e81d3 am: c542170b4b Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/1963802 Change-Id: I6714c714a841afd29ef3f04058537970694e6f73
2022-01-27[LSC] Add LOCAL_LICENSE_KINDS to external/python/cachetools am: a0eafbe930 ↵Bob Badour
am: c0bc8e81d3 Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/1963802 Change-Id: I2001d4ed7be2cd7653301b80a43db0c3ef9fbc47
2022-01-27[LSC] Add LOCAL_LICENSE_KINDS to external/python/cachetools am: a0eafbe930Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/1963802 Change-Id: I098737ab7a7fe429ff3bdb246b73d013101fbc5d
2022-01-27[LSC] Add LOCAL_LICENSE_KINDS to external/python/cachetoolsBob Badour
Added SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I911db599ab7d0f4d36728bc4ea41212d80c4e17a
2021-12-09Release platform/external/python/cachetools v4.2.4 am: 39c4b449e8 am: ↵chojoyce
e79c25b3e1 am: 47f9b551e3 am: a24bdfb58c Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/1908894 Change-Id: I63da41851395f7766a4d34fc291b6b4981d2698b
2021-12-09Release platform/external/python/cachetools v4.2.4 am: 39c4b449e8 am: ↵chojoyce
e79c25b3e1 am: 47f9b551e3 Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/1908894 Change-Id: If8f84fb4cc23bb1cde5f5784bbf2e03c41919dd2
2021-12-08Release platform/external/python/cachetools v4.2.4 am: 39c4b449e8 am: e79c25b3e1chojoyce
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/1908894 Change-Id: I1921382c371c2b92f8f492ea4b4cea8c989dade3
2021-12-08Release platform/external/python/cachetools v4.2.4 am: 39c4b449e8chojoyce
Original change: https://android-review.googlesource.com/c/platform/external/python/cachetools/+/1908894 Change-Id: Ib1e33fb4ccc92032d82483bbb0491c6e0aecc36d
2021-12-08Release platform/external/python/cachetools v4.2.4chojoyce
Bug: 154879379 Test: m acloud && run acloud-dev create Exempt-From-Owner-Approval: release library Change-Id: I5b808f4e6212141cc654abac127b03b72b1a197a
2021-10-11Merge pull request #229 from hugovk/add-3.10Thomas Kemmer
Add support for Python 3.10
2021-10-11Add support for Python 3.10Hugo van Kemenade
2021-09-30Merge pull request #226 from wimglenn/stacklevel-2Thomas Kemmer
stacklevel 2 warnings
2021-09-30use stacklevel=2 for deprecation warnings, so the source/line number of the ↵wim glenn
user code is indicated
2021-09-30Release v4.2.4.Thomas Kemmer
2021-09-30Fix #225: Add submodule shims for backward compatibility.Thomas Kemmer
2021-09-29Release v4.2.3.Thomas Kemmer
2021-09-29Fix #210: Link to typeshed typing stubs.Thomas Kemmer
2021-09-29Fix #216: Add documentation and tests for using TTLCache with datetime.Thomas Kemmer
2021-09-27Explicitly specify autoclass members.Thomas Kemmer
2021-09-27Fix #178: Flatten package file hierarchy.Thomas Kemmer
2021-08-09Fix CI target URL.Thomas Kemmer
2021-08-09Move CI to GitHub Actions, coverage to Codecov.Thomas Kemmer
2021-04-27Release v4.2.2.Thomas Kemmer
2021-04-27Remove Libraries.io SourceRank.Thomas Kemmer
2021-04-27Pin check-manifest version for Python < 3.8 due to Travis issues.Thomas Kemmer
2021-04-27Add Travis Python 3.10-dev build.Thomas Kemmer
2021-04-27Add src directory.Thomas Kemmer
2021-04-27Single source package version.Thomas Kemmer
2021-04-27Add pyproject.tomlThomas Kemmer
2021-04-27Fix copyright year.Thomas Kemmer
2021-04-27Remove Python 2 remnants.Thomas Kemmer
2021-04-27Format code with black.Thomas Kemmer
2021-03-08Use https URIs only.Thomas Kemmer
2021-01-24Release v4.2.1.Thomas Kemmer