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

[3.12] add convenience outputs, switch away from cdts #713

Merged
merged 5 commits into from
Sep 22, 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
5 changes: 2 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 13 additions & 11 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 19 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions recipe/yum_requirements.txt
Original file line number Diff line number Diff line change
@@ -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