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: move more links to the conda org from conda-incubator #816

Merged
merged 1 commit into from
Aug 14, 2024
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:

jobs:
build-and-deploy:
if: github.repository == 'conda-incubator/rattler'
if: github.repository == 'conda/rattler'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ Lock file support has been moved into its own crate (rattler_lock) and support f

### ✨ Highlights

The solver has been renamed and moved to its own repository: [resolvo](https://github.com/conda-incubator/resolvo).
The solver has been renamed and moved to its own repository: [resolvo](https://github.com/mamba-org/resolvo).
With the latest changes to the python bindings you can now download repodata and solve environments!
Still no official release of the bindings though, but getting closer every day.

Expand Down Expand Up @@ -531,7 +531,7 @@ The biggest highlights are:
JLAP is a file format to incrementally update a cached `repodata.json` without downloading the entire file.
This can save a huge amount of bandwidth for large repodatas that change often (like those from conda-forge).
If you have a previously cached `repodata.json` on your system only small JSON patches are downloaded to bring your cache up to date.
The format was initially proposed through a [CEP](https://github.com/conda-incubator/ceps/pull/20) and has been available in conda as an experimental feature since `23.3.0`.
The format was initially proposed through a [CEP](https://github.com/conda/ceps/pull/20) and has been available in conda as an experimental feature since `23.3.0`.

When using rattler you get JLAP support out of the box.
No changes are needed.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
[chat-badge]: https://img.shields.io/discord/1082332781146800168.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2&style=flat-square
[chat-url]: https://discord.gg/kKV8ZxyzY4
[docs-main-badge]: https://img.shields.io/badge/rust_docs-main-yellow.svg?style=flat-square
[docs-main]: https://conda-incubator.github.io/rattler
[docs-main]: https://conda.github.io/rattler
[py-docs-main-badge]: https://img.shields.io/badge/python_docs-main-yellow.svg?style=flat-square
[py-docs-main]: https://conda-incubator.github.io/rattler/py-rattler
[py-docs-main]: https://conda.github.io/rattler/py-rattler
[pixi-badge]:https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json
[pixi-url]: https://pixi.sh

Expand Down Expand Up @@ -105,7 +105,7 @@ You can find these crates in the `crates` folder.

Additionally, we provide Python bindings for most of the functionalities provided by the above crates.
A python package `py-rattler` is available on [conda-forge](https://prefix.dev/channels/conda-forge/packages/py-rattler) and [PyPI](https://pypi.org/project/py-rattler/).
Documatation for the python bindings can be found [here](https://conda-incubator.github.io/rattler/py-rattler).
Documentation for the python bindings can be found [here](https://conda.github.io/rattler/py-rattler).

## What is conda & conda-forge?

Expand Down
2 changes: 1 addition & 1 deletion cliff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# See documentation for more information on available options.

[remote.github]
owner = "conda-incubator"
owner = "conda"
repo = "rattler"

[changelog]
Expand Down
2 changes: 1 addition & 1 deletion crates/rattler_repodata_gateway/src/fetch/jlap/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//! that conda compatible applications use to query conda packages. For more information about
//! how this file format works, please read this CEP proposal:
//!
//! - <https://github.com/conda-incubator/ceps/pull/20/files>
//! - <https://github.com/conda/ceps/pull/20/files>
//!
//! ## Example
//!
Expand Down
2 changes: 1 addition & 1 deletion py-rattler/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ license = "BSD-3-Clause"

[project.urls]
Homepage = "https://github.com/conda/rattler"
Documentation = "https://conda-incubator.github.io/rattler/py-rattler/"
Documentation = "https://conda.github.io/rattler/py-rattler/"
Repository = "https://github.com/conda/rattler"
Issues = "https://github.com/conda/rattler/labels/python-bindings"

Expand Down
2 changes: 1 addition & 1 deletion py-rattler/rattler/package/about_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def doc_url(self) -> List[str]:
```python
>>> about = AboutJson.from_path("../test-data/dummy-about.json")
>>> about.doc_url
['https://conda-incubator.github.io/rattler/py-rattler/']
['https://conda.github.io/rattler/py-rattler/']
>>>
```
"""
Expand Down
2 changes: 1 addition & 1 deletion test-data/dummy-about.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"description": "A dummy description.",
"dev_url": "https://github.com/conda/rattler",
"doc_url": "https://conda-incubator.github.io/rattler/py-rattler/",
"doc_url": "https://conda.github.io/rattler/py-rattler/",
"home": "http://github.com/conda/rattler",
"license": "BSD-3-Clause",
"source_url": "https://github.com/conda/rattler",
Expand Down
2 changes: 1 addition & 1 deletion test-data/environments/mamba_dev_extra.environment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://github.com/conda-incubator/mamba/blob/main/dev/environment-dev-extra.yml
# https://github.com/mamba-org/mamba/blob/main/dev/environment-dev-extra.yml
channels:
- conda-forge
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion test-data/test-server/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# test-server

A simple server to serve repodata for test purposes.
Originally implemented by [mamba](https://github.com/conda-incubator/mamba/tree/a8d595b6ff8ac182e60741c3e8cbd142e7d19905/mamba/tests)
Originally implemented by [mamba](https://github.com/mamba-org/mamba/tree/a8d595b6ff8ac182e60741c3e8cbd142e7d19905/mamba/tests)
under the BSD-3-Clause license.
2 changes: 1 addition & 1 deletion test-data/test-server/repo/channeldata.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dev_url": null,
"doc_source_url": null,
"doc_url": null,
"home": "https://github.com/conda-incubator/mamba",
"home": "https://github.com/mamba-org/mamba",
"icon_hash": null,
"icon_url": null,
"identifiers": null,
Expand Down
2 changes: 1 addition & 1 deletion test-data/test-server/repo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h3><a href="rss.xml">RSS Feed</a>&nbsp;&nbsp;&nbsp;<a href="channeldata.json">c
<th class="tight">noarch</th> <th>Summary</th>
</tr>
<tr>
<td class="packagename"><a href="https://github.com/conda-incubator/mamba" alt="test-package">test-package</a></td>
<td class="packagename"><a href="https://github.com/mamba-org/mamba" alt="test-package">test-package</a></td>
<td class="version">0.1</td>
<td></td>
<td></td>
Expand Down
2 changes: 1 addition & 1 deletion test-data/test-server/repo/recipes/test-package/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build:
noarch: generic

about:
home: https://github.com/conda-incubator/mamba
home: https://github.com/mamba-org/mamba
license: BSD
license_family: BSD
summary: I am just a test package!
2 changes: 1 addition & 1 deletion test-data/test-server/reposerver.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# File taken from https://github.com/conda-incubator/mamba/tree/a8d595b6ff8ac182e60741c3e8cbd142e7d19905/mamba/tests
# File taken from https://github.com/mamba-org/mamba/tree/a8d595b6ff8ac182e60741c3e8cbd142e7d19905/mamba/tests
# under BSD-3-Clause license

import argparse
Expand Down
Loading