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

Normalize REPOSITORY_URL #2206

Merged
merged 4 commits into from
Sep 2, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove redundant normalize_url()
Signed-off-by: Austin Liu <[email protected]>
  • Loading branch information
austin362667 committed Sep 2, 2024
commit fa5a47010737207e104efba04a516affaf739c68
16 changes: 4 additions & 12 deletions src/upload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ pub struct PublishOpt {
}

impl PublishOpt {
const DEFAULT_REPOSITORY_URL: &'static str = "https://upload.pypi.org/legacy/";
const TEST_REPOSITORY_URL: &'static str = "https://test.pypi.org/legacy/";
const DEFAULT_REPOSITORY_URL: &'static str = "https://upload.pypi.org/legacy";
const TEST_REPOSITORY_URL: &'static str = "https://test.pypi.org/legacy";

/// Set to non interactive mode if we're running on CI
pub fn non_interactive_on_ci(&mut self) {
Expand Down Expand Up @@ -322,16 +322,8 @@ fn complete_registry(opt: &PublishOpt) -> Result<Registry> {
{
let normalized_url = PublishOpt::normalize_url(repository_url);
austin362667 marked this conversation as resolved.
Show resolved Hide resolved
let name = match normalized_url {
normalized
if normalized == PublishOpt::normalize_url(PublishOpt::DEFAULT_REPOSITORY_URL) =>
{
Some("pypi")
}
normalized
if normalized == PublishOpt::normalize_url(PublishOpt::TEST_REPOSITORY_URL) =>
{
Some("testpypi")
}
normalized if normalized == PublishOpt::DEFAULT_REPOSITORY_URL => Some("pypi"),
normalized if normalized == PublishOpt::TEST_REPOSITORY_URL => Some("testpypi"),
austin362667 marked this conversation as resolved.
Show resolved Hide resolved
_ => None,
};
(name, repository_url.to_string())
Expand Down
Loading