Merge branch 'main' into issue/4792

conda · Sep 22, 2023 · 5319c35 · 5319c35
2 parents 6cc23bf + 0a3ecf0
commit 5319c35
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2773,7 +2773,7 @@ https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#host
 * pyldd: disambiguate java .class files from Mach-O fat files (same magic number)  #2328
 * fix hash regex for downloaded files in `src_cache`  #2330
 * fix `zip_keys` becoming a loop dimension when variants passed as object rather than loaded from file  #2333
-* fix windows always warning about old compiler activation.  Now only warns if {{ compiler() }} is not used.  #2333
+* fix windows always warning about old compiler activation.  Now only warns if `{{ compiler() }}` is not used.  #2333
 * Add `LD_RUN_PATH` back into Linux variables for now (may remove later, but will have deprecation cycle)  #2334
 
 ### Contributors

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ SHELL := /bin/bash -o pipefail -o errexit
 # ENV_NAME=dev TMPDIR=$HOME make test
 ENV_NAME ?= conda-build
 DOC_ENV_NAME ?= conda-build-docs
-PYTHON_VERSION ?= 3.8
+PYTHON_VERSION ?= 3.11
 TMPDIR := $(shell if test -w $(TMPDIR); then echo $(TMPDIR); else echo ./tmp/ ; fi)conda-build-testing
 
 # We want to bypass the shell wrapper function and use the binary directly for conda-run specifically

diff --git a/conda_build/build.py b/conda_build/build.py
@@ -2606,6 +2606,7 @@ def build(
 
         utils.rm_rf(m.config.info_dir)
         files1 = utils.prefix_files(prefix=m.config.host_prefix)
+        os.makedirs(m.config.build_folder, exist_ok=True)
         with open(join(m.config.build_folder, "prefix_files.txt"), "w") as f:
             f.write("\n".join(sorted(list(files1))))
             f.write("\n")

diff --git a/conda_build/environ.py b/conda_build/environ.py
@@ -580,7 +580,7 @@ def get_shlib_ext(host_platform):
         return ".dll"
     elif host_platform in ["osx", "darwin"]:
         return ".dylib"
-    elif host_platform.startswith("linux"):
+    elif host_platform.startswith("linux") or host_platform.endswith("-wasm32"):
         return ".so"
     elif host_platform == "noarch":
         # noarch packages should not contain shared libraries, use the system

diff --git a/conda_build/metadata.py b/conda_build/metadata.py
@@ -124,14 +124,17 @@ def get_selectors(config: Config) -> dict[str, bool]:
         linux=plat.startswith("linux-"),
         linux32=bool(plat == "linux-32"),
         linux64=bool(plat == "linux-64"),
+        emscripten=plat.startswith("emscripten-"),
+        wasi=plat.startswith("wasi-"),
         arm=plat.startswith("linux-arm"),
         osx=plat.startswith("osx-"),
-        unix=plat.startswith(("linux-", "osx-")),
+        unix=plat.startswith(("linux-", "osx-", "emscripten-")),
         win=plat.startswith("win-"),
         win32=bool(plat == "win-32"),
         win64=bool(plat == "win-64"),
         x86=plat.endswith(("-32", "-64")),
         x86_64=plat.endswith("-64"),
+        wasm32=bool(plat.endswith("-wasm32")),
         os=os,
         environ=os.environ,
         nomkl=bool(int(os.environ.get("FEATURE_NOMKL", False))),

diff --git a/conda_build/utils.py b/conda_build/utils.py
@@ -105,6 +105,8 @@
 mmap_PROT_WRITE = 0 if on_win else mmap.PROT_WRITE
 
 DEFAULT_SUBDIRS = {
+    "emscripten-wasm32",
+    "wasi-wasm32",
     "linux-64",
     "linux-32",
     "linux-s390x",

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,20 +1,20 @@
-linkify-it-py==1.0.1
-myst-parser==0.15.2
-Pillow==9.3.0
+linkify-it-py==2.0.2
+myst-parser==2.0.0
+Pillow==10.0.1
 PyYAML==6.0.1
 requests==2.31.0
-ruamel.yaml==0.17.16
-Sphinx==4.2.0
-sphinx-argparse==0.3.1
+ruamel.yaml==0.17.32
+Sphinx==7.2.6
+sphinx-argparse==0.4.0
 sphinx-autobuild==2021.3.14
-sphinx-rtd-theme==1.0.0
-sphinx-sitemap==2.2.0
-sphinxcontrib-applehelp==1.0.2
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==2.0.0
+sphinx-rtd-theme==1.3.0
+sphinx-sitemap==2.5.1
+sphinxcontrib-applehelp==1.0.7
+sphinxcontrib-devhelp==1.0.5
+sphinxcontrib-htmlhelp==2.0.4
 sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-plantuml==0.21
+sphinxcontrib-plantuml==0.26
 sphinxcontrib-programoutput==0.17
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.5
-pylint==2.11.1
+sphinxcontrib-qthelp==1.0.6
+sphinxcontrib-serializinghtml==1.1.9
+pylint==2.17.5
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -88,7 +88,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -206,7 +206,7 @@
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {"https://docs.python.org/": None}
+intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}
 
 # -- Options for todo extension ----------------------------------------------
 

diff --git a/news/4813-wasm-platforms b/news/4813-wasm-platforms
@@ -0,0 +1,19 @@
+### Enhancements
+
+* Handle `emscripten-wasm32` and `wasi-wasm32` platforms. (#4813)
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* <news item>
diff --git a/tests/test_api_skeleton.py b/tests/test_api_skeleton.py
@@ -28,13 +28,19 @@
 from conda_build.utils import on_win
 from conda_build.version import _parse as parse_version
 
-SYMPY_URL = "https://pypi.python.org/packages/source/s/sympy/sympy-1.10.tar.gz#md5=b3f5189ad782bbcb1bedc1ec2ca12f29"
+SYMPY_URL = (
+    "https://files.pythonhosted.org/packages/7d/23/70fa970c07f0960f7543af982d2554be805e1034b9dcee9cb3082ce80f80/sympy-1.10.tar.gz"
+    "#sha256=6cf85a5cfe8fff69553e745b05128de6fc8de8f291965c63871c79701dc6efc9"
+)
 
 PYLINT_VERSION = "2.3.1"
 PYLINT_HASH_TYPE = "sha256"
 PYLINT_HASH_VALUE = "723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1"
+PYLINT_HASH_VALUE_BLAKE2 = (
+    "018b538911c0ebc2529f15004f4cb07e3ca562bb9aacea5df89cc25b62e01891"
+)
 PYLINT_FILENAME = f"pylint-{PYLINT_VERSION}.tar.gz"
-PYLINT_URL = f"https://pypi.python.org/packages/source/p/pylint/{PYLINT_FILENAME}#{PYLINT_HASH_TYPE}={PYLINT_HASH_VALUE}"
+PYLINT_URL = f"https://files.pythonhosted.org/packages/{PYLINT_HASH_VALUE_BLAKE2[:2]}/{PYLINT_HASH_VALUE_BLAKE2[2:4]}/{PYLINT_HASH_VALUE_BLAKE2[4:]}/{PYLINT_FILENAME}"
 
 
 @pytest.fixture