diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 3a0db7a3..f387b25b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -55,10 +55,9 @@ ulimit -n 1024 # run "conda smithy rerender" and this line will be updated # automatically. /usr/bin/sudo -n yum install -y libX11 libxcb libxau +) - - -)# make the build number clobber +# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf2..a45c34fd 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/README.md b/README.md index 1562065d..43f50b53 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,8 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | +| [![Conda Recipe](https://img.shields.io/badge/recipe-cpython-green.svg)](https://anaconda.org/conda-forge/cpython) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/cpython.svg)](https://anaconda.org/conda-forge/cpython) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/cpython.svg)](https://anaconda.org/conda-forge/cpython) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/cpython.svg)](https://anaconda.org/conda-forge/cpython) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-cpython--gil-green.svg)](https://anaconda.org/conda-forge/cpython-gil) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/cpython-gil.svg)](https://anaconda.org/conda-forge/cpython-gil) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/cpython-gil.svg)](https://anaconda.org/conda-forge/cpython-gil) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/cpython-gil.svg)](https://anaconda.org/conda-forge/cpython-gil) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libpython--static-green.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python-green.svg)](https://anaconda.org/conda-forge/python) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | @@ -141,41 +143,41 @@ conda config --add channels conda-forge/label/python_debug conda config --set channel_priority strict ``` -Once the `conda-forge/label/python_debug` channel has been enabled, `libpython-static, python` can be installed with `conda`: +Once the `conda-forge/label/python_debug` channel has been enabled, `cpython, cpython-gil, libpython-static, python` can be installed with `conda`: ``` -conda install libpython-static python +conda install cpython cpython-gil libpython-static python ``` or with `mamba`: ``` -mamba install libpython-static python +mamba install cpython cpython-gil libpython-static python ``` -It is possible to list all of the versions of `libpython-static` available on your platform with `conda`: +It is possible to list all of the versions of `cpython` available on your platform with `conda`: ``` -conda search libpython-static --channel conda-forge/label/python_debug +conda search cpython --channel conda-forge/label/python_debug ``` or with `mamba`: ``` -mamba search libpython-static --channel conda-forge/label/python_debug +mamba search cpython --channel conda-forge/label/python_debug ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search libpython-static --channel conda-forge/label/python_debug +mamba repoquery search cpython --channel conda-forge/label/python_debug -# List packages depending on `libpython-static`: -mamba repoquery whoneeds libpython-static --channel conda-forge/label/python_debug +# List packages depending on `cpython`: +mamba repoquery whoneeds cpython --channel conda-forge/label/python_debug -# List dependencies of `libpython-static`: -mamba repoquery depends libpython-static --channel conda-forge/label/python_debug +# List dependencies of `cpython`: +mamba repoquery depends cpython --channel conda-forge/label/python_debug ``` diff --git a/build-locally.py b/build-locally.py index 8ac9b846..6788aea6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1d43f306..bd808c35 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 0 %} +{% set build_number = 1 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -101,6 +101,8 @@ outputs: ignore_run_exports_from: # [unix] # C++ only installed so CXX is defined for distutils/sysconfig. - {{ compiler('cxx') }} # [unix] + # this is just to get the headers needed for tk.h, but is unused + - xorg-libx11 # Disabled until verified to work correctly detect_binary_files_with_prefix: true # detect_binary_files_with_prefix: False @@ -149,8 +151,6 @@ outputs: - {{ compiler('c') }} - {{ stdlib('c') }} - {{ compiler('cxx') }} - - {{ cdt('xorg-x11-proto-devel') }} # [linux] - - {{ cdt('libx11-devel') }} # [linux] - make # [not win] - libtool # [unix] - pkg-config # [not win] @@ -181,6 +181,8 @@ outputs: - openssl - readline # [not win] - tk + # this is just to get the headers needed for tk.h, but is unused + - xorg-libx11 - ncurses # [unix] - libffi - ld_impl_{{ target_platform }} >=2.36.1 # [linux] @@ -315,6 +317,20 @@ outputs: - bash build-and-test.sh # [unix] - popd # [unix] + - name: cpython + build: + noarch: generic + requirements: + - python {{ version }}.* + - python_abi * *_cp{{ ver2nd }} + + - name: cpython-gil + build: + noarch: generic + requirements: + - cpython {{ version }}.* + - python_abi * *_cp{{ ver2nd }} + about: home: https://www.python.org/ license: Python-2.0 diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt index cfb2ee6b..e1482717 100644 --- a/recipe/yum_requirements.txt +++ b/recipe/yum_requirements.txt @@ -1,3 +1,5 @@ +#tk_needs_libx11_but_avoids_a_runtime_requirement_of_libx11_to_reduce_the_dependencies_of_python libX11 +#libxcb_is_a_dependency_of_libx11_but_deps_are_wrong_on_our_cdt libxcb libxau