diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 0193d9d..cb24946 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,6 +16,10 @@ jobs: CONFIG: linux_64_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.12.____cpythonpython_implcpython: + CONFIG: linux_64_python3.12.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.8.____cpythonpython_implcpython: CONFIG: linux_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -36,6 +40,10 @@ jobs: CONFIG: linux_aarch64_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_python3.12.____cpythonpython_implcpython: + CONFIG: linux_aarch64_python3.12.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.8.____cpythonpython_implcpython: CONFIG: linux_aarch64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -56,6 +64,10 @@ jobs: CONFIG: linux_ppc64le_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.12.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_python3.12.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_python3.8.____cpythonpython_implcpython: CONFIG: linux_ppc64le_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 5344a5f..1739c32 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,6 +14,9 @@ jobs: osx_64_python3.11.____cpythonpython_implcpython: CONFIG: osx_64_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' + osx_64_python3.12.____cpythonpython_implcpython: + CONFIG: osx_64_python3.12.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' osx_64_python3.8.____cpythonpython_implcpython: CONFIG: osx_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -29,6 +32,9 @@ jobs: osx_arm64_python3.11.____cpython: CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_python3.8.____cpython: CONFIG: osx_arm64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 79bd5d6..4ee7213 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,9 @@ jobs: win_64_python3.11.____cpythonpython_implcpython: CONFIG: win_64_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' + win_64_python3.12.____cpythonpython_implcpython: + CONFIG: win_64_python3.12.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' win_64_python3.8.____cpythonpython_implcpython: CONFIG: win_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml new file mode 100644 index 0000000..7ec3517 --- /dev/null +++ b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml @@ -0,0 +1,25 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml new file mode 100644 index 0000000..0300fec --- /dev/null +++ b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml @@ -0,0 +1,29 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml new file mode 100644 index 0000000..51e20c7 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml @@ -0,0 +1,25 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +zip_keys: +- - python + - python_impl diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 0000000..b39b1bb --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,38 @@ +migrator_ts: 1695046563 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 30 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.12.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython diff --git a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml new file mode 100644 index 0000000..529657a --- /dev/null +++ b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml @@ -0,0 +1,25 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml new file mode 100644 index 0000000..dd50de7 --- /dev/null +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -0,0 +1,25 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml new file mode 100644 index 0000000..5b20837 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- win-64 +zip_keys: +- - python + - python_impl diff --git a/README.md b/README.md index 7654066..c5d16d2 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,13 @@ Current build status variant + + linux_64_python3.12.____cpythonpython_implcpython + + + variant + + linux_64_python3.8.____cpythonpython_implcpython @@ -79,6 +86,13 @@ Current build status variant + + linux_aarch64_python3.12.____cpythonpython_implcpython + + + variant + + linux_aarch64_python3.8.____cpythonpython_implcpython @@ -114,6 +128,13 @@ Current build status variant + + linux_ppc64le_python3.12.____cpythonpython_implcpython + + + variant + + linux_ppc64le_python3.8.____cpythonpython_implcpython @@ -149,6 +170,13 @@ Current build status variant + + osx_64_python3.12.____cpythonpython_implcpython + + + variant + + osx_64_python3.8.____cpythonpython_implcpython @@ -184,6 +212,13 @@ Current build status variant + + osx_arm64_python3.12.____cpython + + + variant + + osx_arm64_python3.8.____cpython @@ -212,6 +247,13 @@ Current build status variant + + win_64_python3.12.____cpythonpython_implcpython + + + variant + + win_64_python3.8.____cpythonpython_implcpython diff --git a/conda-forge.yml b/conda-forge.yml index b797add..b523282 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,10 +1,12 @@ bot: - inspect: update-grayskull automerge: true + inspect: update-grayskull build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -18,5 +20,3 @@ provider: linux_ppc64le: azure win: azure test: native_and_emulated -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 121bfd1..04d8482 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.8.6" %} +{% set version = "3.9.0b0" %} package: name: aiohttp @@ -6,16 +6,20 @@ package: source: - url: https://pypi.io/packages/source/a/aiohttp/aiohttp-{{ version }}.tar.gz - sha256: b0cf2a4501bff9330a8a5248b4ce951851e415bdcce9dc158e76cfd55e15085c + sha256: cecc64fd7bae6debdf43437e3c83183c40d4f4d86486946f412c113960598eee # download sources to have tests, which don't get installed; # installing from source is very painful, beware... - url: https://github.com/aio-libs/aiohttp/archive/refs/tags/v{{ version }}.tar.gz - sha256: f437a7a676ee59f933a3592e3777690110bc570b38f702192bf349805382c22d + sha256: 8a01be9ea85f2b9d101080246c4f4e82b2df4b9ec04afd8d9f546bf47f40d850 folder: sources build: - number: 1 + number: 0 script: {{ PYTHON }} -m pip install . -vv + # 3.9.0b0 is the only 3.12-capable release, has some upstream testing + # and the results of our test suite look good, so unblock migration; + # for the other python versions, remove this as soon as there's 3.9.0 GA. + skip: true # [py<312] requirements: build: @@ -30,9 +34,8 @@ requirements: run: - python - aiosignal >=1.1.2 - - async-timeout <5.0,>=4.0.0a3 + - async-timeout >=4.0,<5.0 # [py<311] - attrs >=17.3.0 - - charset-normalizer >=2.0,<4.0 - frozenlist >=1.1.1 - multidict >=4.5,<7.0 - yarl >=1.0,<2.0 @@ -61,14 +64,17 @@ test: - rm -rf sources/tests/autobahn # [unix] - rmdir /s /q sources\tests\autobahn # [win] {% set tests_to_skip = "_not_a_real_test" %} - {% set tests_to_skip = tests_to_skip + " or test_feed_eof_no_err_brotli" %} {% set tests_to_skip = tests_to_skip + " or test_http_response_parser_bad_chunked_strict_c[pyloop]" %} {% set tests_to_skip = tests_to_skip + " or test_http_response_parser_bad_chunked_strict_py[pyloop]" %} {% set tests_to_skip = tests_to_skip + " or test_http_response_parser_strict_headers[c-parser-pyloop]" %} - {% set tests_to_skip = tests_to_skip + " or test_request_tracing_url_params[pyloop]" %} {% set tests_to_skip = tests_to_skip + " or test_tcp_connector_raise_connector_ssl_error[pyloop]" %} # test failing with python >=3.11 {% set tests_to_skip = tests_to_skip + " or test_https_proxy_unsupported_tls_in_tls[pyloop-https]" %} # [py>=311] + # fails to open socket at desired IP/port + {% set tests_to_skip = tests_to_skip + " or (test_web_server and test_handler_cancellation)" %} # [linux] + {% set tests_to_skip = tests_to_skip + " or (test_web_server and test_no_handler_cancellation)" %} # [linux] + # emulation is too slow for expected speed + {% set tests_to_skip = tests_to_skip + " or (test_imports and test_import_time)" %} # [aarch64 or ppc64le] # aio seems to hard-code expectation for cpython (i.e. not "pypy3.9" in SP_DIR path) {% set tests_to_skip = tests_to_skip + " or test_static_route_user_home" %} # [python_impl == "pypy"] # not working with pypy (all platforms)