From 2516655b60cab9f6382f86e40f55f799f47f1bc3 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 28 Mar 2022 12:29:00 -0700 Subject: [PATCH 1/4] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.03.28.15.31.32 --- .ci_support/README | 7 +++++- .gitattributes | 1 + .github/CODEOWNERS | 3 +-- .scripts/build_steps.sh | 6 +++-- .scripts/run_docker_build.sh | 2 +- README.md | 46 +++++++++++++++++++++++++++++------- build-locally.py | 11 ++++----- 7 files changed, 54 insertions(+), 22 deletions(-) diff --git a/.ci_support/README b/.ci_support/README index e4e2dce..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1 +1,6 @@ -This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.gitattributes b/.gitattributes index ce52713..7f32763 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ bld.bat text eol=crlf # github helper pieces to make some files not show up in diffs automatically .azure-pipelines/* linguist-generated=true .circleci/* linguist-generated=true +.ci_support/README linguist-generated=true .drone/* linguist-generated=true .drone.yml linguist-generated=true .github/* linguist-generated=true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 25ea848..53db614 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1 @@ -* @ambv @carlodri @mariusvniekerk @xhochy -* @seanlaw \ No newline at end of file +* @ambv @carlodri @mariusvniekerk @seanlaw @xhochy \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ff01283..d71d6ae 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -29,8 +29,10 @@ conda-build: CONDARC -mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge -mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba install --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 0c6515f..9236239 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -14,7 +14,7 @@ set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" if [ -z ${FEEDSTOCK_NAME} ]; then diff --git a/README.md b/README.md index cbc1483..fda327f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: https://github.com/python/black Package license: MIT -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/black-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/black-feedstock/blob/main/LICENSE.txt) Summary: The Uncompromising Code Formatter @@ -25,8 +25,8 @@ Current build status @@ -52,18 +52,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `black, black-colorama, black-jupyter, blackd` can be installed with: +Once the `conda-forge` channel has been enabled, `black, black-colorama, black-jupyter, blackd` can be installed with `conda`: ``` conda install black black-colorama black-jupyter blackd ``` -It is possible to list all of the versions of `black` available on your platform with: +or with `mamba`: + +``` +mamba install black black-colorama black-jupyter blackd +``` + +It is possible to list all of the versions of `black` available on your platform with `conda`: ``` conda search black --channel conda-forge ``` +or with `mamba`: + +``` +mamba search black --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search black --channel conda-forge + +# List packages depending on `black`: +mamba repoquery whoneeds black --channel conda-forge + +# List dependencies of `black`: +mamba repoquery depends black --channel conda-forge +``` + About conda-forge ================= @@ -79,10 +104,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) +it is possible to build and upload installable packages to the +[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. @@ -132,5 +159,6 @@ Feedstock Maintainers * [@ambv](https://github.com/ambv/) * [@carlodri](https://github.com/carlodri/) * [@mariusvniekerk](https://github.com/mariusvniekerk/) +* [@seanlaw](https://github.com/seanlaw/) * [@xhochy](https://github.com/xhochy/) diff --git a/build-locally.py b/build-locally.py index 8b74348..eec38a0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -22,10 +22,6 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) - if "OSX_SDK_DIR" not in os.environ: - os.environ["OSX_SDK_DIR"] = os.path.join( - os.path.dirname(__file__), "SDKs" - ) def run_docker_build(ns): @@ -65,11 +61,12 @@ def verify_config(ns): raise ValueError( f"only Linux/macOS configs currently supported, got {ns.config}" ) - elif ns.config.startswith("osx") and platform.system() == "Darwin": + elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" - "to download the SDK automatically to '/opt/MacOSX.sdk'" + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " + "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 1c94754d5019599130eb45f5861507a35cf6f665 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 28 Mar 2022 12:45:04 -0700 Subject: [PATCH 2/4] Release 22.3.0 --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f80e358..8c289d0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "black" %} -{% set version = "22.1.0" %} +{% set version = "22.3.0" %} package: name: {{ name|lower }}-recipe @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: a7c0192d35635f6fc1174be575cb7915e92e5dd629ee79fdaf0dcfa41a80afb5 + sha256: 35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79 build: number: 0 @@ -85,18 +85,18 @@ outputs: - python -c 'import black.handle_ipynb_magics; assert black.handle_ipynb_magics.jupyter_dependencies_are_installed(verbose=True, quiet=False) == True' about: - home: https://github.com/python/black + home: https://github.com/psf/black license: MIT license_family: MIT license_file: LICENSE - summary: The Uncompromising Code Formatter + summary: The uncompromising code formatter. description: | Black is the uncompromising Python code formatter. By using it, you agree to cease control over minutiae of hand-formatting. In return, Black gives you speed, determinism, and freedom from pycodestyle nagging about formatting. You will save time and mental energy for more important matters. - doc_url: https://github.com/psf/black + doc_url: https://black.readthedocs.io/ dev_url: https://github.com/psf/black extra: From 0fcc19f5de4b91c95c1d0508f0721f0d1b188587 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 28 Mar 2022 12:46:01 -0700 Subject: [PATCH 3/4] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.03.28.19.38.17 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fda327f..c33efd4 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ About black-recipe ================== -Home: https://github.com/python/black +Home: https://github.com/psf/black Package license: MIT Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/black-feedstock/blob/main/LICENSE.txt) -Summary: The Uncompromising Code Formatter +Summary: The uncompromising code formatter. Development: https://github.com/psf/black -Documentation: https://github.com/psf/black +Documentation: https://black.readthedocs.io/ Black is the uncompromising Python code formatter. By using it, you agree to cease control over minutiae of hand-formatting. In return, Black gives From 403e27dba51f77ff61a2b82835cd63713f027925 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 28 Mar 2022 13:02:26 -0700 Subject: [PATCH 4/4] Drop `black-primer` --- recipe/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8c289d0..d7dd8f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,6 @@ outputs: noarch: python entry_points: - black = black:patched_main - - black-primer = black_primer.cli:main requirements: host: - python >=3.6 @@ -40,7 +39,6 @@ outputs: - pip commands: - black --help - - black-primer --help - pip check - name: {{ name }}d @@ -56,7 +54,6 @@ outputs: test: commands: - black --help - - black-primer --help - blackd --help - name: {{ name }}-colorama @@ -69,7 +66,6 @@ outputs: test: commands: - black --help - - black-primer --help - name: {{ name }}-jupyter build:
All platforms: - - + +