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

fix: parse ~= as version not as path #804

Merged

Conversation

ruben-arts
Copy link
Collaborator

@ruben-arts ruben-arts commented Aug 6, 2024

By adding the path parsing to the nameless matchspec I broke the parsing of ~= 1.2.3.

This PR changes a few things to better deal with that.

  • It now checks for ~/ to verify if it is a path
  • We can now parse ~/channel_name::package as the tilde is now actually parsed instead of seen as part of the string.
  • Added a bunch more test cases to catch more issues in the future.

@ruben-arts ruben-arts requested a review from baszalmstra August 6, 2024 06:46
@ruben-arts
Copy link
Collaborator Author

@baszalmstra The ~\ wasn't something that worked with the TypedPath::starts_with(). Removed that code again but added more tests.

@ruben-arts
Copy link
Collaborator Author

The insta::settings!({filters}... are sooooooo awesome!

@ruben-arts ruben-arts requested a review from baszalmstra August 6, 2024 15:34
@baszalmstra baszalmstra merged commit 98a555d into conda:main Aug 6, 2024
15 checks passed
baszalmstra added a commit that referenced this pull request Aug 6, 2024
## 🤖 New release
* `rattler_conda_types`: 0.27.0 -> 0.27.1
* `rattler`: 0.27.3 -> 0.27.4
* `rattler_cache`: 0.1.5 -> 0.1.6
* `rattler_package_streaming`: 0.22.0 -> 0.22.1
* `rattler_shell`: 0.21.4 -> 0.21.5
* `rattler_lock`: 0.22.17 -> 0.22.18
* `rattler_repodata_gateway`: 0.21.4 -> 0.21.5
* `rattler_solve`: 1.0.1 -> 1.0.2
* `rattler_virtual_packages`: 1.0.1 -> 1.0.2
* `rattler_index`: 0.19.22 -> 0.19.23

<details><summary><i><b>Changelog</b></i></summary><p>

## `rattler_conda_types`
<blockquote>

##
[0.27.1](baszalmstra/rattler@rattler_conda_types-v0.27.0...rattler_conda_types-v0.27.1)
- 2024-08-06

### Fixed
- parse `~=` as version not as path
([#804](https://github.com/baszalmstra/rattler/pull/804))
</blockquote>

## `rattler`
<blockquote>

##
[0.27.4](baszalmstra/rattler@rattler-v0.27.3...rattler-v0.27.4)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>

## `rattler_cache`
<blockquote>

##
[0.1.6](baszalmstra/rattler@rattler_cache-v0.1.5...rattler_cache-v0.1.6)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>

## `rattler_package_streaming`
<blockquote>

##
[0.22.1](baszalmstra/rattler@rattler_package_streaming-v0.22.0...rattler_package_streaming-v0.22.1)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>

## `rattler_shell`
<blockquote>

##
[0.21.5](baszalmstra/rattler@rattler_shell-v0.21.4...rattler_shell-v0.21.5)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>

## `rattler_lock`
<blockquote>

##
[0.22.18](baszalmstra/rattler@rattler_lock-v0.22.17...rattler_lock-v0.22.18)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>

## `rattler_repodata_gateway`
<blockquote>

##
[0.21.5](baszalmstra/rattler@rattler_repodata_gateway-v0.21.4...rattler_repodata_gateway-v0.21.5)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>

## `rattler_solve`
<blockquote>

##
[1.0.2](baszalmstra/rattler@rattler_solve-v1.0.1...rattler_solve-v1.0.2)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>

## `rattler_virtual_packages`
<blockquote>

##
[1.0.2](baszalmstra/rattler@rattler_virtual_packages-v1.0.1...rattler_virtual_packages-v1.0.2)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>

## `rattler_index`
<blockquote>

##
[0.19.23](baszalmstra/rattler@rattler_index-v0.19.22...rattler_index-v0.19.23)
- 2024-08-06

### Other
- updated the following local packages: rattler_conda_types
</blockquote>


</p></details>

---
This PR was generated with
[release-plz](https://github.com/MarcoIeni/release-plz/).

Signed-off-by: Bas Zalmstra <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants