Merge pull request #108 from zuzukin/python-3.12

Python 3.12

.github/workflows/python-package-conda.yml

@@ -9,20 +9,25 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.10", "3.11"]
+        python-version: ["3.8", "3.10", "3.12"]
     steps:
     - uses: actions/checkout@v3
     - uses: goanpeca/setup-miniconda@v2.2.0
       with:
-        miniforge-variant: Mambaforge-pypy3
+        miniforge-version: latest
+        conda-version: ">=23.7.4"
+        # auto-update-conda: true
         conda-build-version: ">=3.26"
         environment-file: environment.yml
         activate-environment: whl2conda-dev
         python-version: ${{ matrix.python-version }}
-        auto-update-conda: true
-        condarc-file: github-condarc.yml
         auto-activate-base: true
+        condarc-file: github-condarc.yml
         use-mamba: true
+    - name: show conda versions
+      run: |
+        conda list -n base conda
+        conda list -n base mamba
     - name: Dev install whl2conda
       run: |
         conda run -n whl2conda-dev pip install -e . --no-deps --no-build-isolation

Makefile

@@ -75,7 +75,8 @@ help:
 DEV_INSTALL := $(CONDA_RUN) pip install -e . --no-deps --no-build-isolation
 
 createdev:
-	conda env create -f environment.yml -n $(DEV_ENV) --yes
+	conda create -n $(DEV_ENV) python=3.12 --yes
+	conda env update -f environment.yml -n $(DEV_ENV)
 	$(MAKE) dev-install
 
 updatedev:

conda.recipe/meta.yaml

@@ -29,18 +29,21 @@ build:
 
 requirements:
   build:
-    - python 3.11
+    - python 3.12
     - hatchling
     - setuptools
 
-
   run:
     - python {{ project['requires-python'] }}
 
     {% for dep in project['dependencies'] %}
     - {{ dep.lower() }}
     {% endfor %}
 
+whl2conda:
+  something:
+    - foo
+    - bar
 
 test:
   source_files:

environment.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - garpy # for mkdocstrings-python-xref
 dependencies:
-  - python >=3.8,<3.12
+  - python >=3.8,<3.13
   # runtime
   - conda-package-handling >=2.2,<3.0
   - platformdirs >=3.10
@@ -16,12 +16,12 @@ dependencies:
   - make >=4.3
   # testing
   - mypy >=1.5,<2.0
-  - pylint >=2.17,<3.0
+  - pylint >=2.17
   - pytest >=7.4,<8.0
   - pytest-cov >=4.1.0,<5.0
   - types-pyyaml >=6.0
   # documentation
-  - black >=23.7
+  - black >=22.6
   - mike >=1.1,<2.0
   - mkdocs >=1.5,<2.0
   - mkdocstrings-python >=1.3,<2.0
@@ -34,6 +34,3 @@ dependencies:
   - pip >=23.2.1
   - pip:
       - mkdocs-awesome-pages-plugin >=2.9.2
-
-
-

pyproject.toml

@@ -20,6 +20,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 keywords = ["conda", "wheel", "build"]
 requires-python = ">=3.8"
@@ -92,6 +93,9 @@ max-returns = 6
 max-statements = 50
 min-public-methods = 1
 
+[tool.pylint.similarities]
+min-similarity-lines = 6
+
 [tool.pylint.variables]
 allowed-redefined-builtins = ["help", "license"]
 
@@ -105,6 +109,7 @@ disable = [
     "locally-disabled",
     "raw-checker-failed",
     "suppressed-message",
+    "too-many-arguments",
     "trailing-newlines",
     "unspecified-encoding",
     "use-dict-literal",

src/whl2conda/cli/build.py

@@ -56,15 +56,14 @@ def build_main(
     parser = argparse.ArgumentParser(
         description=dedent(
             """
-            Compare the content of two conda packages
-
-            This will unpack each conda packaeg into temporary
-            directories, normalize the layout of files in the 
-            input directory to minimize line differences, and
-            will run the specified diff tool and arguments.
-
-            This can be used to compare packages generated using
-            this tool against those created using conda-build.            
+            Build a conda package from a pure python wheel.
+            
+            This command is limited drop-in replacement for `conda build`.
+            It requires that the conda recipe has a build script entry
+            of the form `pip install` or `pip wheel`.
+            
+            This is an experimental feature and is still under active
+            change and development.
             """
         ),
         formatter_class=argparse.RawTextHelpFormatter,

src/whl2conda/cli/install.py

@@ -29,7 +29,7 @@
 
 from conda_package_handling.api import extract as extract_conda_pkg
 
-from .common import dedent, existing_path, add_markdown_help
+from .common import dedent, existing_path, add_markdown_help, get_conda_bld_path
 
 __all__ = ["install_main"]
 
@@ -202,17 +202,7 @@ def install_main(
 
 def conda_bld_install(parsed: InstallArgs, subdir: str):
     """Install package into conda-bld directory"""
-    config = json.loads(
-        subprocess.check_output(
-            ["conda", "config", "--show", "--json"],
-            encoding="utf8",
-        )
-    )
-    conda_bld = config.get("bld_path") or config.get("croot")
-    if not conda_bld:  # pragma: no cover
-        # this is extremely unlikely to ever occur
-        raise LookupError("Cannot find conda-bld location")
-    conda_bld_path = Path(conda_bld)
+    conda_bld_path = get_conda_bld_path()
     subdir_path = conda_bld_path.joinpath(subdir)  # e.g. noarch/
 
     print(f"Installing {parsed.package_file} into {subdir_path}")
@@ -221,9 +211,8 @@ def conda_bld_install(parsed: InstallArgs, subdir: str):
         shutil.copyfile(
             parsed.package_file, subdir_path.joinpath(parsed.package_file.name)
         )
-        # TODO: use conda-index instead
         subprocess.check_call(
-            ["conda", "index", str(conda_bld_path), "--subdir", subdir]
+            ["conda", "index", "--subdir", subdir, str(conda_bld_path)]
         )
 
 

test/api/test_converter.py

@@ -480,6 +480,7 @@ def test_overwrite_prompt(
     prompts: Iterator[str] = iter(())
     responses: Iterator[str] = iter(())
 
+    # pylint: disable=duplicate-code
     def fake_input(prompt: str) -> str:
         expected_prompt = next(prompts)
         assert re.search(