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.

Sign up for GitHub

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

Just a test -- Test compatibility with zlib 1.3 #684

Closed
wants to merge 4 commits into from
Closed

Just a test -- Test compatibility with zlib 1.3 #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06baf31
Just a test -- Test compatibility with zlib 1.3
hmaarrfk Mar 24, 2024
653f9ee
Add my channel
hmaarrfk Mar 24, 2024
f4d29a6
Fixup zlib dep
hmaarrfk Mar 24, 2024
2dd2104
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and co…
hmaarrfk Mar 24, 2024
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
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

4 changes: 1 addition & 3 deletions .ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge
- mark.harfouche,conda-forge
channel_targets:
- conda-forge python_debug
cxx_compiler:
Expand Down Expand Up @@ -49,5 +49,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
4 changes: 1 addition & 3 deletions .ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge
- mark.harfouche,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down Expand Up @@ -49,5 +49,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
4 changes: 1 addition & 3 deletions .ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge
- mark.harfouche,conda-forge
channel_targets:
- conda-forge python_debug
cxx_compiler:
Expand Down Expand Up @@ -53,5 +53,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
4 changes: 1 addition & 3 deletions .ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge
- mark.harfouche,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down Expand Up @@ -53,5 +53,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_compiler_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- mark.harfouche,conda-forge
channel_targets:
- conda-forge python_debug
cxx_compiler:
Expand Down Expand Up @@ -47,5 +47,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_compiler_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- mark.harfouche,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down Expand Up @@ -47,5 +47,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
2 changes: 0 additions & 2 deletions .ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
2 changes: 0 additions & 2 deletions .ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,3 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
2 changes: 0 additions & 2 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ xz:
zip_keys:
- - build_type
- channel_targets
zlib:
- '1.2'
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions build-locally.py
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ MACOSX_SDK_VERSION: # [osx and x86_64]
build_type:
- release
- debug # [not win]
channel_sources: # [linux]
- mark.harfouche,conda-forge # [linux]
channel_targets:
- conda-forge main
- conda-forge python_debug # [not win]
Expand Down
6 changes: 4 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ outputs:
- tk # [build_platform != target_platform]
- readline # [build_platform != target_platform]
- ncurses # [build_platform != target_platform]
- zlib # [build_platform != target_platform]
- zlib 1.2.* # [build_platform != target_platform]
host:
- bzip2
- sqlite
- xz
- zlib
- zlib 1.2.*
- openssl
- readline # [not win]
- tk
Expand All @@ -181,6 +181,7 @@ outputs:
run:
- ld_impl_{{ target_platform }} >=2.36.1 # [linux]
- tzdata
- zlib >=1.3
{% if dev != '' %}
- _python_rc
{% endif %}
Expand All @@ -199,6 +200,7 @@ outputs:
- {{ compiler('c') }}
# Tried to use enable_language(C) to avoid needing this. It does not work.
- {{ compiler('cxx') }}
- zlib 1.3.*
files:
- tests/cmake/*
- tests/cython/*
Expand Down
Loading