Skip to content

Commit

Permalink
0.1.8 release
Browse files Browse the repository at this point in the history
  • Loading branch information
David-OConnor committed Oct 21, 2019
1 parent cd4616f commit e8bd97b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 19 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,10 @@ black = "^18.0"
`package_url` is used to determine which package repository to upload to. If ommitted,
`Pypi test` is used (`https://test.pypi.org/legacy/`).

Other items you can specify in `[tool.pyflow]`:
- `readme`: The readme filename, use this if it's named something other than `README.md`.
- `build`: A python script to execute building non-python extensions when running `pyflow package`.

## Building this from source
If you’d like to build from source, [download and install Rust]( https://www.rust-lang.org/tools/install),
clone the repo, and in the repo directory, run `cargo build --release`.
Expand Down
9 changes: 5 additions & 4 deletions src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ pub fn build(
.expect(&format!("Problem building using {}", build_file));
}

// Command::new(paths.bin.join("python"))
// .args(&[dummy_setup_fname, "sdist", "bdist_wheel"])
// .status()
// .expect("Problem building");
// Command::new(paths.bin.join("python"))
// .args(&[dummy_setup_fname, "sdist", "bdist_wheel"])
// .status()
// .expect("Problem building");

util::print_color("Build complete.", Color::Green);

Expand Down Expand Up @@ -286,6 +286,7 @@ pub mod test {
)],
extras: HashMap::new(),
repo_url: None,
build: None,
};

let expected = r#"import setuptools
Expand Down
16 changes: 1 addition & 15 deletions src/dep_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1520,18 +1520,6 @@ pub mod tests {
);
}

// #[test]
// fn intersection_contained_many_more() {
// let reqs1 = vec![Constraint::new(Gte, 4, 9, 2)];
// let reqs2 = vec![Constraint::new(Gte, 4, 9, 4), Constraint::new(Lt, 5, 5, 5)];
// let reqs3 = vec![Constraint::new(Gte, 4, 9, 4), Constraint::new(Lt, 5, 5, 5)];
//
// assert_eq!(
// intersection_many(&[reqs1, reqs2, reqs3]),
// vec![(Version::new(4, 9, 4), Version::new(5, 5, 4))]
// );
// }

#[test]
fn python_version_from_warehouse() {
let a1 = Constraint::from_wh_py_vers("py3").unwrap();
Expand All @@ -1546,8 +1534,6 @@ pub mod tests {
assert_eq!(
a2,
vec![
// Constraint::new(Gte, Version::new(3, 5, 0)),
// Constraint::new(Lte, Version::new(3, 8, 0)),
Constraint::new(Exact, Version::new(3, 5, 0)),
Constraint::new(Exact, Version::new(3, 6, 0)),
Constraint::new(Exact, Version::new(3, 7, 0)),
Expand All @@ -1566,6 +1552,6 @@ pub mod tests {

assert_eq!(a5, vec![Constraint::new(Exact, Version::new(3, 6, 0))]);
assert_eq!(a6, vec![Constraint::new(Gte, Version::new(2, 0, 0))]);
assert_eq!(a7, vec![Constraint::new(Exact, Version::new(2, 7, 0))]);
assert_eq!(a7, vec![Constraint::new(Caret, Version::new(2, 7, 0))]);
}
}

0 comments on commit e8bd97b

Please sign in to comment.