Rename to conda-pypi

.github/workflows/test.yml

@@ -8,7 +8,7 @@ on:
  pull_request:
  paths:
  - ".github/workflows/test.yml"
- - "conda_pip/**"
+ - "conda_pypi/**"
  - "tests/**"
  - "pyproject.toml"
  - "pixi.toml"
@@ -24,37 +24,32 @@ concurrency:
 
 jobs:
  tests:
- name: ${{ matrix.os }}, Python ${{ matrix.python-version }}
- runs-on: ${{ matrix.os }}-latest
+ name: ${{ matrix.os }}, py${{ matrix.python-version }}
+ runs-on: ${{ matrix.os }}
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu, windows]
- python-version: ["3.8", "3.9", "3.10", "3.11"]
+ os: [ubuntu-latest, windows-latest]
+ python-version: ["38", "39", "310", "311"]
  include:
- - os: macos
- python-version: "3.10"
-
+ - os: macos-13
+ python-version: "310"
+ - os: macos-14
+ python-version: "311"
+ env:
+ PIXI_ENV_NAME: test-py${{ matrix.python-version }}
  steps:
  - name: Checkout
  uses: actions/checkout@v3
  with:
  fetch-depth: 0
- - uses: prefix-dev/setup-pixi@v0.4.1
- with:
- cache: false
- run-install: false
+ - uses: prefix-dev/setup-pixi@v0.6.0
  - name: Setup project
  run: |
- pixi add "python=${{ matrix.python-version }}.*=*cpython*"
- pixi run dev
- pixi run conda info
- - name: Configure conda
- run: |
- echo "channels: [conda-forge]" > .pixi/envs/default/.condarc
- - name: Patch history file (temporary)
- run: echo "//fix" > .pixi/envs/default/conda-meta/history 
+ pixi run --environment ${{ env.PIXI_ENV_NAME }} dev
+ echo "channels: [conda-forge]" > .pixi/envs/${{ env.PIXI_ENV_NAME }}/.condarc
+ pixi run --environment ${{ env.PIXI_ENV_NAME }} conda info
  - name: Run tests
- run: pixi run test --basetemp=${{ runner.os == 'Windows' && 'D:\\temp' || runner.temp }}
+ run: pixi run --environment ${{ env.PIXI_ENV_NAME }} test --basetemp=${{ runner.os == 'Windows' && 'D:\\temp' || runner.temp }}
  - name: Build recipe
  run: pixi run build

MANIFEST.in

@@ -1 +1 @@
-conda_pip/data/*
+conda_pypi/data/*

README.md

@@ -1,3 +1,8 @@
-# conda-pip
+# conda-pypi
 
-`pip` wrappers to make it work with `conda` in a better way.
+Better PyPI interoperability for the conda ecosystem.
+
+Includes:
+
+- `conda pip`: A subcommand that wraps `pip` to make it work with `conda` in a better way.
+- Adds `EXTERNALLY-MANAGED` to your environments.

conda_pypi/__init__.py

@@ -0,0 +1,3 @@
+"""
+conda-pypi
+"""

conda_pip/main.py → conda_pypi/main.py

@@ -120,33 +120,33 @@ def run_pip_install(
 
 def ensure_externally_managed(prefix: os.PathLike = None) -> Path:
  """
- conda-pip places its own EXTERNALLY-MANAGED file when it is installed in an environment.
+ conda-pypi places its own EXTERNALLY-MANAGED file when it is installed in an environment.
  We also need to place it in _new_ environments created by conda. We do this by implementing
  some extra plugin hooks.
  """
  target_path = next(get_externally_managed_path(prefix))
  if target_path.exists():
  return target_path
  logger.info("Placing EXTERNALLY-MANAGED in %s", target_path.parent)
- resource = importlib_files("conda_pip") / "data" / "EXTERNALLY-MANAGED"
+ resource = importlib_files("conda_pypi") / "data" / "EXTERNALLY-MANAGED"
  target_path.write_text(resource.read_text())
  return target_path
 
 
 def ensure_target_env_has_externally_managed(command: str):
  """
  post-command hook to ensure that the target env has the EXTERNALLY-MANAGED file
- even when it is created by conda, not 'conda-pip'.
+ even when it is created by conda, not 'conda-pypi'.
  """
  if os.environ.get("CONDA_BUILD_STATE") == "BUILD":
  return
  base_prefix = Path(context.conda_prefix)
  target_prefix = Path(context.target_prefix)
  if base_prefix == target_prefix:
  return
- # ensure conda-pip was explicitly installed in base env (and not as a dependency)
+ # ensure conda-pypi was explicitly installed in base env (and not as a dependency)
  requested_specs_map = History(base_prefix).get_requested_specs_map()
- if requested_specs_map and "conda-pip" not in requested_specs_map:
+ if requested_specs_map and "conda-pypi" not in requested_specs_map:
  return
  prefix_data = PrefixData(target_prefix)
  if command in {"create", "install", "update"}:

conda_pip/plugin.py → conda_pypi/plugin.py

@@ -1,6 +1,3 @@
-# Copyright (C) 2022 Anaconda, Inc
-# Copyright (C) 2023 conda
-# SPDX-License-Identifier: BSD-3-Clause
 from conda import plugins
 
 from .cli import configure_parser, execute
@@ -19,7 +16,7 @@ def conda_subcommands():
 @plugins.hookimpl
 def conda_post_commands():
  yield plugins.CondaPostCommand(
- name="conda-pip-ensure-target-env-has-externally-managed",
+ name="conda-pypi-ensure-target-env-has-externally-managed",
  action=ensure_target_env_has_externally_managed,
  run_for={"install", "create", "update", "remove"},
  )