Skip to content
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 .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repos:
# auto format Python codes within docstrings
- id: blacken-docs
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.14
rev: v0.15.2
hooks:
# lint & attempt to correct failures (e.g. pyupgrade)
- id: ruff
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ You'll need a copy of `pixi` and `git` in your machine. Then:
4. `pixi run docs` to build the docs and `pixi run serve` to serve them in your browser.
5. `pixi run lint` to run the pre-commit linters and formatters.

Note: Be sure to include updates to the changelog in your pull request.
Note: Be sure to include updates to the changelog in your pull request.
10 changes: 5 additions & 5 deletions docs/developer/releasing.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Releasing conda-pypi

Here are the steps for creating a new conda-pypi release. Before
you start, make sure that you have access to create tags and
Here are the steps for creating a new conda-pypi release. Before
you start, make sure that you have access to create tags and
releases on the conda/conda-pypi repo. If you have the ability
to merge pull requests, then you are probably good to go.

Expand All @@ -21,13 +21,13 @@ Click the green `Publish release` button.

### 1.b Ensure the build completed successfully

Navigate to the [actions tab](https://github.com/conda/conda-pypi/actions).
Navigate to the [actions tab](https://github.com/conda/conda-pypi/actions).
You should be able to see the `Publish to PyPI` workflow with title matching
the release number from earlier. Ensure that this workflow completes successfully.

### 1.c Ensure the package is available on PyPI

Check that the PyPI package has been updated at https://pypi.org/project/conda-pypi/.
Check that the PyPI package has been updated at https://pypi.org/project/conda-pypi/.
You should see that version matches the release version and that the wheel is available
in the [download files](https://pypi.org/project/conda-pypi/#files) section.

Expand All @@ -50,7 +50,7 @@ $ python -c "import conda_pypi; print(conda_pypi._version.version)"

## 2. Update the conda-forge/conda-pypi-feedstock

Next we'll need to make sure the newest version is available on
Next we'll need to make sure the newest version is available on
conda-forge. This happens on the conda forge repo [conda-pypi-feedstock](https://github.com/conda-forge/conda-pypi-feedstock).

There are 2 options here:
Expand Down
6 changes: 3 additions & 3 deletions docs/developer/testing/mock-channel-server.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_with_mock_channel(conda_local_channel):
```

The fixture automatically:
1. Starts an HTTP server on a port automatically
1. Starts an HTTP server on a port automatically
2. Serves the `tests/conda_local_channel/` directory
3. Returns the server URL
4. Cleans up the server after the test completes
Expand Down Expand Up @@ -118,8 +118,8 @@ you'll need to update the repodata in order to include the new wheels
you with to support. This is done by using the `tests/conda_local_channel/generate_noarch_wheel_repodata.py` script. Note, this script is designed for generating test repodata for
conda-pypi only.

1. **Update the list of wheels** in tests/conda_local_channel/wheel_packages.txt.
Add your package in the same form as a `requirements.txt` dependency, `<name>==<version>`,
1. **Update the list of wheels** in tests/conda_local_channel/wheel_packages.txt.
Add your package in the same form as a `requirements.txt` dependency, `<name>==<version>`,
for example

```
Expand Down
2 changes: 1 addition & 1 deletion tests/conda_local_channel/noarch/repodata.json
Original file line number Diff line number Diff line change
Expand Up @@ -331,4 +331,4 @@
"noarch": "python"
}
}
}
}
Loading