Skip to content

Commit 643bf04

Browse files
authored
Remove tar and tar.xz sdist support since PyPI does not support them
1 parent 7960d5d commit 643bf04

File tree

5 files changed

+1
-33
lines changed

5 files changed

+1
-33
lines changed

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ flate2 = "1.0.20"
1717
fs-err = "2.6.0"
1818
mailparse = "0.13.4"
1919
tar = "0.4.35"
20-
xz = "0.1.0"
2120
zip = "0.5.12"

src/distribution.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use std::str::FromStr;
44

55
use bzip2::read::BzDecoder;
66
use flate2::read::GzDecoder;
7-
use xz::read::XzDecoder;
87
use zip::ZipArchive;
98

109
use crate::{Error, Metadata};
@@ -23,10 +22,8 @@ pub enum DistributionType {
2322
#[derive(Debug, Clone, Copy)]
2423
enum SDistType {
2524
Zip,
26-
Tar,
2725
GzTar,
2826
BzTar,
29-
XzTar,
3027
}
3128

3229
/// Python package distribution
@@ -42,10 +39,8 @@ impl FromStr for SDistType {
4239
fn from_str(s: &str) -> Result<Self, Self::Err> {
4340
let dist_type = match s {
4441
"zip" => SDistType::Zip,
45-
"tar" => SDistType::Tar,
4642
"gz" => SDistType::GzTar,
4743
"bz2" => SDistType::BzTar,
48-
"xz" => SDistType::XzTar,
4944
_ => return Err(Error::UnknownDistributionType),
5045
};
5146
Ok(dist_type)
@@ -58,7 +53,7 @@ impl Distribution {
5853
let path = path.as_ref();
5954
if let Some(ext) = path.extension().and_then(|ext| ext.to_str()) {
6055
let dist_type = match ext {
61-
"zip" | "tar" | "gz" | "bz2" | "xz" => DistributionType::SDist,
56+
"zip" | "gz" | "bz2" => DistributionType::SDist,
6257
"egg" => DistributionType::Egg,
6358
"whl" => DistributionType::Wheel,
6459
_ => return Err(Error::UnknownDistributionType),
@@ -95,13 +90,9 @@ impl Distribution {
9590
SDistType::GzTar => {
9691
Self::parse_tar(GzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
9792
}
98-
SDistType::Tar => Self::parse_tar(BufReader::new(fs_err::File::open(path)?)),
9993
SDistType::BzTar => {
10094
Self::parse_tar(BzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
10195
}
102-
SDistType::XzTar => {
103-
Self::parse_tar(XzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
104-
}
10596
}
10697
}
10798

tests/fixtures/build-0.4.0.tar

-90 KB
Binary file not shown.

tests/fixtures/build-0.4.0.tar.xz

-11.6 KB
Binary file not shown.

tests/test_distribution.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,6 @@ fn test_parse_sdist_zip() {
3333
assert!(metadata.download_url.is_none());
3434
}
3535

36-
#[test]
37-
fn test_parse_sdist_tar() {
38-
let dist = Distribution::new("tests/fixtures/build-0.4.0.tar").unwrap();
39-
assert_eq!(dist.r#type(), DistributionType::SDist);
40-
let metadata = dist.metadata();
41-
assert_eq!(metadata.metadata_version, "2.1");
42-
assert_eq!(metadata.name, "build");
43-
assert!(metadata.home_page.is_none());
44-
assert!(metadata.download_url.is_none());
45-
}
46-
4736
#[test]
4837
fn test_parse_sdist_tar_gz() {
4938
let dist = Distribution::new("tests/fixtures/build-0.4.0.tar.gz").unwrap();
@@ -65,14 +54,3 @@ fn test_parse_sdist_tar_bz2() {
6554
assert!(metadata.home_page.is_none());
6655
assert!(metadata.download_url.is_none());
6756
}
68-
69-
#[test]
70-
fn test_parse_sdist_tar_xz() {
71-
let dist = Distribution::new("tests/fixtures/build-0.4.0.tar.xz").unwrap();
72-
assert_eq!(dist.r#type(), DistributionType::SDist);
73-
let metadata = dist.metadata();
74-
assert_eq!(metadata.metadata_version, "2.1");
75-
assert_eq!(metadata.name, "build");
76-
assert!(metadata.home_page.is_none());
77-
assert!(metadata.download_url.is_none());
78-
}

0 commit comments

Comments
 (0)