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

Remove testdata #3635

Merged
merged 13 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
*.postcard binary
provider/testdata/data/baked/** linguist-generated=true
provider/repodata/data/json/** linguist-generated=true
provider/repodata/data/cldr/** linguist-generated=true
provider/repodata/data/icuexport/** linguist-generated=true
provider/datagen/data/** linguist-generated=true
provider/datagen/tests/data/json/** linguist-generated=true
provider/datagen/tests/data/cldr/** linguist-generated=true
provider/datagen/tests/data/icuexport/** linguist-generated=true
ffi/diplomat/c/include/** linguist-generated=true
ffi/diplomat/cpp/include/** linguist-generated=true
ffi/diplomat/cpp/docs/** linguist-generated=true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/artifacts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ jobs:
git checkout empty
gsutil -m cp -r benchmarks/binsize/ gs://${{ env.GCP_BUCKET_ID }}/gha/${{ github.sha }}/benchmarks/binsize

# Data size benchmark: track size of provider/testdata/data/testdata.postcard (total data size).
# Data size benchmark: track size of provider/datagen/tests/data/testdata.postcard (total data size).
bench-datasize:
# This is too expensive to run on every push, so only run it on main.
# When running on a PR, comment this out and set the BASELINE variable below to the baseline commit.
Expand All @@ -548,9 +548,9 @@ jobs:
run: |
mkdir -p benchmarks/datasize

- name: Measure size of selected data package provider/testdata/data/testdata.postcard
- name: Measure size of selected data package provider/datagen/tests/data/testdata.postcard
run: |
cargo run --package icu_benchmark_binsize -- provider/testdata/data/testdata.postcard file | tee benchmarks/datasize/output.txt
cargo run --package icu_benchmark_binsize -- provider/datagen/tests/data/testdata.postcard file | tee benchmarks/datasize/output.txt

- name: Download previous benchmark data
run: |
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ dhat-heap.json
/benchmarks

# Do not check-in binary file tree test data
provider/testdata/data/postcard/*
!provider/testdata/data/postcard/fingerprints.csv
provider/datagen/tests/data/postcard/*
!provider/datagen/tests/data/postcard/fingerprints.csv

# Ignore irrelevant files that get generated on macOS
**/.DS_Store
Expand Down
58 changes: 2 additions & 56 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ members = [
"provider/datagen",
"provider/fs",
"provider/macros",
"provider/repodata",
"provider/testdata",
"tools/benchmark/binsize",
"tools/benchmark/macros",
"tools/benchmark/memory",
Expand Down Expand Up @@ -84,6 +82,10 @@ members = [
exclude = [
# GNaw needs to be run from outside the workspace for features to work
"ffi/gn",
# Testdata will still be published in the 1.x stream, but is deprecated
# and we don't use it anymore. As we don't want to keep the actual data
# in the repo it doesn't build without running `cargo make testdata` first.
"provider/testdata",
]

# LTO is needed for WASM and other size-optimized builds,
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ An example `ICU4X` powered application in Rust may look like below...

```toml
[dependencies]
icu = "1.0.0"
icu_testdata = "1.0.0"
icu = "1.3.0"
```

`src/main.rs`:
Expand All @@ -44,8 +43,8 @@ use icu::locid::locale;
let options =
length::Bag::from_date_time_style(length::Date::Long, length::Time::Medium).into();

let dtf = DateTimeFormatter::try_new_unstable(&icu_testdata::unstable(), &locale!("es").into(), options)
.expect("Failed to create DateTimeFormatter instance.");
let dtf = DateTimeFormatter::try_new(&locale!("es").into(), options)
.expect("locale should be present");

let date = DateTime::try_new_iso_datetime(2020, 9, 12, 12, 35, 0).expect("Failed to parse date.");
let date = date.to_any();
Expand Down
1 change: 0 additions & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ ignore:
- "**/tests/**/*"
- "**/benches/**/*"
- "**/examples/**/*"
- "provider/testdata/**/*"

# Disable Codecov action from leaving comments on PRs
# https://docs.codecov.com/docs/pull-request-comments#disable-comment
Expand Down
Loading
Loading