diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 000000000..a083c2e87 --- /dev/null +++ b/.codespellrc @@ -0,0 +1,5 @@ +# See: https://github.com/codespell-project/codespell#using-a-config-file +[codespell] +# In case of a false positive, add the problematic word, in all lowercase, to a comma-separated list here: +ignore-words-list = , +skip = ./.git diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 24c7a8b96..ed22cae25 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -27,7 +27,7 @@ jobs: # (default: secrets.GITHUB_TOKEN) token: ${{ secrets.CLA_ACTION_TOKEN }} # [required] - # Label to apply to contributor's PR once CLA is singed + # Label to apply to contributor's PR once CLA is signed label: cla-signed # [required] diff --git a/.gitignore b/.gitignore index f59cc75aa..3e310031b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ env # Directories docs/_build/ -docs/source/_build/ \ No newline at end of file +docs/source/_build/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000..cb2ece331 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,48 @@ +# Apply to all files without commiting: +# pre-commit run --all-files +# Update this file: +# pre-commit autoupdate +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + # standard end of line/end of file cleanup + - id: mixed-line-ending + - id: end-of-file-fixer + - id: trailing-whitespace + # ensure syntaxes are valid + - id: check-yaml + # catch git merge/rebase problems + - id: check-merge-conflict + - repo: https://github.com/asottile/pyupgrade + rev: v3.3.1 + hooks: + - id: pyupgrade + args: [--py38-plus] + - repo: https://github.com/PyCQA/isort + rev: 5.12.0 + hooks: + - id: isort + args: + - --profile=black + - repo: https://github.com/psf/black + rev: 23.7.0 + hooks: + - id: black + - repo: https://github.com/pycqa/flake8 + rev: 6.0.0 + hooks: + - id: flake8 + - repo: https://github.com/codespell-project/codespell + rev: v2.2.4 + hooks: + - id: codespell + args: [--write] + - repo: https://github.com/python-jsonschema/check-jsonschema + rev: 0.23.3 + hooks: + - id: check-github-workflows + - repo: meta + hooks: + - id: check-hooks-apply + - id: check-useless-excludes diff --git a/README.md b/README.md index f5624c6a8..eef05547d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Please file issues, comments, and pull requests at the appropriate repo. ### Conda capitalization -The word "conda" should be lowercase, except when starting a sentence or header. Use code formatting when talking about the `conda` command. +The word "conda" should be lowercase, except when starting a sentence or header. Use code formatting when talking about the `conda` command. For more detailed information on conda capitalization standards, see the [conda contributing guide](https://github.com/conda/conda/blob/main/CONTRIBUTING.md#conda-capitalization-standards). diff --git a/docs/.vscode/settings.json b/docs/.vscode/settings.json index 4b4b223a5..ac3758f31 100644 --- a/docs/.vscode/settings.json +++ b/docs/.vscode/settings.json @@ -1,3 +1,3 @@ { "restructuredtext.confPath": "${workspaceFolder}/source" -} \ No newline at end of file +} diff --git a/docs/source/_static/css/custom.css b/docs/source/_static/css/custom.css index 6a21f07ec..95805e211 100644 --- a/docs/source/_static/css/custom.css +++ b/docs/source/_static/css/custom.css @@ -38,7 +38,7 @@ /*header 1 text color */ color: #047704; } - + .rst-content .toctree-wrapper p.caption, h2, h3, h4, h5, h6, legend { /*text color of rst content and subheads*/ color: #414042; @@ -80,4 +80,4 @@ h1, h2, .rst-content .toctree-wrapper p.caption, h3, h4, h5, h6, legend { .wy-nav-top { /*color of nav at top when the window is narrow*/ background: #43B02A; -} \ No newline at end of file +} diff --git a/docs/source/conf.py b/docs/source/conf.py index 3d5af1547..5463225ff 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # (c) 2012-2017 Anaconda, Inc. / https://www.anaconda.com # All Rights Reserved @@ -17,88 +16,89 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os +import os +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.insert(0, os.path.abspath('../..')) +sys.path.insert(0, os.path.abspath("../..")) # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' +# needs_sphinx = '1.0' # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ - 'sphinx.ext.autodoc', - 'sphinx.ext.autosummary', - 'sphinx.ext.graphviz', - 'sphinx.ext.ifconfig', - 'sphinx.ext.inheritance_diagram', + "sphinx.ext.autodoc", + "sphinx.ext.autosummary", + "sphinx.ext.graphviz", + "sphinx.ext.ifconfig", + "sphinx.ext.inheritance_diagram", # 'sphinx.ext.napoleon', "sphinx_sitemap", ] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The suffix of source filenames. -source_suffix = '.rst' +source_suffix = ".rst" # The encoding of source files. -#source_encoding = 'utf-8-sig' +# source_encoding = 'utf-8-sig' # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = u'conda' -copyright = u'2017, Anaconda, Inc.' +project = "conda" +copyright = "2017, Anaconda, Inc." # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = ' ' +version = " " # The full version, including alpha/beta/rc tags. -release = ' ' +release = " " # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -#language = None +# language = None # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -#today = '' +# today = '' # Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' +# today_fmt = '%B %d, %Y' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. exclude_patterns = [] # The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None +# default_role = None # If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True +# add_function_parentheses = True # If true, the current module name will be prepended to all description # unit titles (such as .. function::). -#add_module_names = True +# add_module_names = True # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. -#show_authors = False +# show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # A list of ignored prefixes for module index sorting. -modindex_common_prefix = ['conda.'] +modindex_common_prefix = ["conda."] # -- Options for HTML output --------------------------------------------------- @@ -111,15 +111,15 @@ html_theme = "sphinx_rtd_theme" html_context = { - 'github_user': 'conda', - 'github_repo': 'conda-docs', - 'github_version': 'master/', - 'display_github': True, - 'conf_py_path': 'docs/source/', - 'source_suffix': '.rst', - } + "github_user": "conda", + "github_repo": "conda-docs", + "github_version": "master/", + "display_github": True, + "conf_py_path": "docs/source/", + "source_suffix": ".rst", +} -html_favicon = 'conda-logo.png' +html_favicon = "conda-logo.png" # Serving the robots.txt since we want to point to the sitemap.xml file html_extra_path = ["robots.txt"] @@ -127,75 +127,75 @@ # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. -#html_theme_options = {} +# html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +# html_theme_path = [] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -#html_title = None +# html_title = None # A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None +# html_short_title = None # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +# html_logo = None # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None +# html_favicon = None # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +# html_last_updated_fmt = '%b %d, %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. -#html_use_smartypants = True +# html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -#html_sidebars = {} +# html_sidebars = {} # Additional templates that should be rendered to pages, maps page names to # template names. -#html_additional_pages = {} +# html_additional_pages = {} # If false, no module index is generated. -#html_domain_indices = True +# html_domain_indices = True # If false, no index is generated. -#html_use_index = True +# html_use_index = True # If true, the index is split into individual pages for each letter. -#html_split_index = False +# html_split_index = False # If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True +# html_show_sourcelink = True # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True +# html_show_sphinx = True # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True +# html_show_copyright = True # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. -#html_use_opensearch = '' +# html_use_opensearch = '' # This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None +# html_file_suffix = None # Setting the prod URL of the site here as the base URL. -html_baseurl = f"https://docs.conda.io/" +html_baseurl = "https://docs.conda.io/" # We don't have a locale set, so we can safely ignore that for the sitemaps. sitemap_locales = [None] @@ -205,62 +205,56 @@ sitemap_url_scheme = "{lang}latest/{link}" # Output file base name for HTML help builder. -htmlhelp_basename = 'condadoc' +htmlhelp_basename = "condadoc" -html_style = 'css/custom.css' +html_style = "css/custom.css" # -- Options for LaTeX output -------------------------------------------------- latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', + # The paper size ('letterpaper' or 'a4paper'). + # 'papersize': 'letterpaper', + # The font size ('10pt', '11pt' or '12pt'). + # 'pointsize': '10pt', + # Additional stuff for the LaTeX preamble. + # 'preamble': '', } # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'conda.tex', u'conda Documentation', - u'Anaconda, Inc.', 'manual'), + ("index", "conda.tex", "conda Documentation", "Anaconda, Inc.", "manual"), ] # The name of an image file (relative to this directory) to place at the top of # the title page. -#latex_logo = None +# latex_logo = None # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. -#latex_use_parts = False +# latex_use_parts = False # If true, show page references after internal links. -#latex_show_pagerefs = False +# latex_show_pagerefs = False # If true, show URL addresses after external links. -#latex_show_urls = False +# latex_show_urls = False # Documents to append as an appendix to all manuals. -#latex_appendices = [] +# latex_appendices = [] # If false, no module index is generated. -#latex_domain_indices = True +# latex_domain_indices = True # -- Options for manual page output -------------------------------------------- # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'conda', u'conda Documentation', - [u'Anaconda, Inc.'], 1) -] +man_pages = [("index", "conda", "conda Documentation", ["Anaconda, Inc."], 1)] # If true, show URL addresses after external links. -#man_show_urls = False +# man_show_urls = False # -- Options for Texinfo output ------------------------------------------------ @@ -269,16 +263,22 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'conda', u'conda Documentation', - u'Anaconda, Inc.', 'conda', 'One line description of project.', - 'Miscellaneous'), + ( + "index", + "conda", + "conda Documentation", + "Anaconda, Inc.", + "conda", + "One line description of project.", + "Miscellaneous", + ), ] # Documents to append as an appendix to all manuals. -#texinfo_appendices = [] +# texinfo_appendices = [] # If false, no module index is generated. -#texinfo_domain_indices = True +# texinfo_domain_indices = True # How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' +# texinfo_show_urls = 'footnote' diff --git a/docs/source/create_miniconda_hash_rst.py b/docs/source/create_miniconda_hash_rst.py index 172dbdb37..b65144535 100644 --- a/docs/source/create_miniconda_hash_rst.py +++ b/docs/source/create_miniconda_hash_rst.py @@ -4,15 +4,16 @@ """ -import urllib.request -import json import datetime +import json import math import os import time -from packaging.version import Version +import urllib.request from pathlib import Path +from packaging.version import Version + # Column lengths FILENAME_LEN = 47 SIZE_LEN = 9 @@ -26,16 +27,16 @@ def sizeof_fmt(num, suffix="B"): for unit in ["", "Ki", "Mi", "Gi"]: if abs(num) < 1024.0: - return "%3.1f %s%s" % (num, unit, suffix) + return f"{num:3.1f} {unit}{suffix}" num /= 1024.0 - return "%.1f %s%s" % (num, "Yi", suffix) + return "{:.1f} {}{}".format(num, "Yi", suffix) def main(): # ================================================================= # The main hosting server is central time, so pretend we are too # in order for anyone to be able to run this on Unix platforms. - os.environ['TZ'] = 'US/Central' + os.environ["TZ"] = "US/Central" time.tzset() # ================================================================= @@ -44,7 +45,9 @@ def main(): data = json.loads(f.read().decode("utf-8")) # remove index.json and 'latest' entries data.pop("index.json") - data = {k: v for k, v in data.items() if "latest" not in k and "uninstaller" not in k} + data = { + k: v for k, v in data.items() if "latest" not in k and "uninstaller" not in k + } # write file with hashes for all files f = open(OUT_FILENAME, "w") @@ -91,7 +94,7 @@ def sorting_key(filename): """ # 1. conda_version_platform_ext version_str = filename.split("-")[1] - # Starting with v4.8.2 in 2020, we release Miniconda variants for each + # Starting with v4.8.2 in 2020, we release Miniconda variants for each # python version we support: Miniconda3-py3XX_-. # So we need to split that off. if "_" in version_str: diff --git a/docs/source/create_miniconda_rst.py b/docs/source/create_miniconda_rst.py index ac30d71f0..8418d7594 100755 --- a/docs/source/create_miniconda_rst.py +++ b/docs/source/create_miniconda_rst.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -""" +""" Create miniconda.rst file with size and sha256 for latest installers. See the miniconda.rst.jinja2 for the template that is ultimately rendered. @@ -14,12 +14,12 @@ """ import datetime -import urllib.request import json +import urllib.request +from pathlib import Path from jinja2 import Template from packaging.version import Version -from pathlib import Path HERE = Path(__file__).parent OUT_FILENAME = HERE / "miniconda.rst" @@ -28,7 +28,9 @@ # Update these! MINICONDA_VERSION = "23.5.2-0" -PYTHON_VERSION = "3.11.3" # This is the version of Python that's bundled into the Miniconda installers. +PYTHON_VERSION = ( + "3.11.3" # the version of Python that's bundled into the Miniconda installers. +) PY_VERSIONS = ("3.11", "3.10", "3.9", "3.8") # Must be sorted in the order in which they appear on the Miniconda page @@ -92,9 +94,9 @@ def sizeof_fmt(num, suffix="B"): for unit in ["", "Ki", "Mi", "Gi"]: if abs(num) < 1024.0: - return "%3.1f %s%s" % (num, unit, suffix) + return f"{num:3.1f} {unit}{suffix}" num /= 1024.0 - return "%.1f %s%s" % (num, "Yi", suffix) + return "{:.1f} {}{}".format(num, "Yi", suffix) def get_latest_miniconda_sizes_and_hashes(): @@ -112,7 +114,7 @@ def get_latest_miniconda_sizes_and_hashes(): "operating_systems": OPERATING_SYSTEMS, "py_versions": sorted(PY_VERSIONS, reverse=True, key=Version), } - info["platforms"] = {(os,"latest"): [] for os in info["operating_systems"]} + info["platforms"] = {(os, "latest"): [] for os in info["operating_systems"]} for platform_id, installer_data in PLATFORM_MAP.items(): latest_installer = f"Miniconda3-latest-{installer_data['suffix']}" @@ -121,8 +123,8 @@ def get_latest_miniconda_sizes_and_hashes(): mdate = datetime.date.fromtimestamp(mtime) info["release_date"] = mdate.strftime("%B %-d, %Y") os = installer_data["operating_system"] - info["platforms"][os,"latest"].append(installer_data.copy()) - info["platforms"][os,"latest"][-1]["hash"] = data[latest_installer]["sha256"] + info["platforms"][os, "latest"].append(installer_data.copy()) + info["platforms"][os, "latest"][-1]["hash"] = data[latest_installer]["sha256"] for py_version in info["py_versions"]: py = py_version.replace(".", "") full_installer = ( @@ -137,10 +139,10 @@ def get_latest_miniconda_sizes_and_hashes(): if full_installer not in data: continue if (os, py_version) not in info["platforms"]: - info["platforms"][os,py_version] = [installer_data.copy()] + info["platforms"][os, py_version] = [installer_data.copy()] else: - info["platforms"][os,py_version].append(installer_data.copy()) - installer = info["platforms"][os,py_version][-1] + info["platforms"][os, py_version].append(installer_data.copy()) + installer = info["platforms"][os, py_version][-1] installer["size"] = sizeof_fmt(data[full_installer]["size"]) installer["hash"] = data[full_installer]["sha256"] # full_installer item is needed until win-32 is removed diff --git a/docs/source/create_release_notes.py b/docs/source/create_release_notes.py index 5dd46e45e..e57eddbc7 100644 --- a/docs/source/create_release_notes.py +++ b/docs/source/create_release_notes.py @@ -1,11 +1,10 @@ import datetime -import urllib.request import json - +import urllib.request from pathlib import Path -from packaging.version import Version -from jinja2 import Template +from jinja2 import Template +from packaging.version import Version SOURCE_DIR = Path(__file__).parent RELEASE_DIR = SOURCE_DIR / "miniconda_releases" @@ -23,7 +22,7 @@ def get_supported_python_versions(miniconda_version, files_info): """ py_versions = [] for filename in files_info: - if not f"_{miniconda_version}-" in filename or "py" not in filename: + if f"_{miniconda_version}-" not in filename or "py" not in filename: continue py_intermediate = filename.split("py")[1] py_version = py_intermediate.split("_")[0] @@ -45,7 +44,7 @@ def get_package_list(dists: list[str]) -> list[dict[str, str]]: "name": pkg_name, "version": pkg_version, "hash": pkg_hash, - "build_num": pkg_build_num + "build_num": pkg_build_num, } packages.append(package) return packages @@ -77,7 +76,9 @@ def get_installer_info(release: Path, files_info: dict) -> dict: platform = info_dict["_platform"] if platform in installer_info: continue - installer_info["package_lists"][platform] = get_package_list(info_dict["_dists"]) + installer_info["package_lists"][platform] = get_package_list( + info_dict["_dists"] + ) # Get release date for filename, data in files_info.items(): @@ -95,20 +96,21 @@ def main(): files_info = json.loads(f.read().decode("utf-8")) release_info = [] - releases = sorted([release.name for release in RELEASE_DIR.iterdir()], reverse=True, key=Version) + releases = sorted( + [release.name for release in RELEASE_DIR.iterdir()], reverse=True, key=Version + ) for release in releases: release_info.append(get_installer_info(RELEASE_DIR / release, files_info)) - + with open(RELEASE_NOTES_TEMPLATE) as f: template_text = f.read() - + template = Template(template_text) rst_text = template.render(release_info=release_info) with open(RELEASE_NOTES_RST, "w") as f: f.write(rst_text) - -if __name__ == "__main__": - main() +if __name__ == "__main__": + main() diff --git a/docs/source/help-support.rst b/docs/source/help-support.rst index da328106f..69650c687 100644 --- a/docs/source/help-support.rst +++ b/docs/source/help-support.rst @@ -34,20 +34,20 @@ request new features and submit any other comments you may have. Contribute recipes to GitHub ============================ -The conda community has transitioned into using feedstocks, which -are repositories that contain package recipes and all of the necessary +The conda community has transitioned into using feedstocks, which +are repositories that contain package recipes and all of the necessary configurations for building those recipes. This enables these packages to be automatically built using continuous integration (CI) services. You can clone or fork many package feedstocks from `Anaconda Recipes `_, though you can't submit new feedstocks to that GitHub organization. To contribute new conda package -feedstocks, submit them to `conda-forge -`_ or `bioconda +feedstocks, submit them to `conda-forge +`_ or `bioconda `_ with a pull request. -Feedstocks are welcome for programs that use any license, such as GPL, -BSD, MIT or Apache, and all of the recipes the conda-forge and +Feedstocks are welcome for programs that use any license, such as GPL, +BSD, MIT or Apache, and all of the recipes the conda-forge and bioconda repositories are released into the public domain. diff --git a/docs/source/img/conda_logo.svg b/docs/source/img/conda_logo.svg index be92cbc62..48f77413e 100644 --- a/docs/source/img/conda_logo.svg +++ b/docs/source/img/conda_logo.svg @@ -81,4 +81,4 @@ - \ No newline at end of file + diff --git a/docs/source/miniconda.rst.jinja2 b/docs/source/miniconda.rst.jinja2 index a7370aa97..fa30302d1 100644 --- a/docs/source/miniconda.rst.jinja2 +++ b/docs/source/miniconda.rst.jinja2 @@ -143,4 +143,3 @@ Other resources $ conda update conda will update conda. - diff --git a/docs/source/miniconda_hashes.rst b/docs/source/miniconda_hashes.rst index fa9a6a7e4..798be6d6f 100644 --- a/docs/source/miniconda_hashes.rst +++ b/docs/source/miniconda_hashes.rst @@ -5,7 +5,7 @@ Miniconda hash information ========================== =============================================== ========= =================== ==================================================================== -Name Size Time modified SHA256 hash +Name Size Time modified SHA256 hash =============================================== ========= =================== ==================================================================== Miniconda3-py311_23.5.2-0-Linux-aarch64.sh 76.4 MiB 2023-07-13 13:55:51 ``3962738cfac270ae4ff30da0e382aecf6b3305a12064b196457747b157749a7a`` Miniconda3-py311_23.5.2-0-Linux-ppc64le.sh 77.3 MiB 2023-07-13 13:55:51 ``92237cb2a443dd15005ec004f2f744b14de02cd5513a00983c2f191eb43d1b29`` diff --git a/docs/source/miniconda_release_notes.rst b/docs/source/miniconda_release_notes.rst index cd83ca2c1..d15ab15cf 100644 --- a/docs/source/miniconda_release_notes.rst +++ b/docs/source/miniconda_release_notes.rst @@ -3,7 +3,7 @@ Miniconda Release Notes ======================= Miniconda 23.5.2 (July 13, 2023) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ User-Facing Changes ------------------- @@ -21,7 +21,7 @@ Available Python Versions Miniconda 23.5.1 (July 12, 2023) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ User-Facing Changes ------------------- @@ -39,7 +39,7 @@ Available Python Versions Miniconda 23.5.0-3 (July 11, 2023) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ User-Facing Changes ------------------- diff --git a/docs/source/miniconda_release_notes.rst.jinja2 b/docs/source/miniconda_release_notes.rst.jinja2 index e45e4b156..24a3835eb 100644 --- a/docs/source/miniconda_release_notes.rst.jinja2 +++ b/docs/source/miniconda_release_notes.rst.jinja2 @@ -6,7 +6,7 @@ Miniconda Release Notes {%- set heading = "Miniconda {} ({})".format(release.version, release.release_date) -%} {{ heading }} -{{ "^" * heading|length }} +{{ "^" * heading|length }} {% if not release.notes -%} {%- else -%} @@ -35,4 +35,4 @@ Packages {%- endfor -%} {%- endif %} -{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-aarch64.sh_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-aarch64.sh_info.json index 5dd4c33a0..84a10c56f 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-aarch64.sh_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-aarch64.sh_info.json @@ -469,4 +469,4 @@ "_has_conda": true, "_extra_envs_info": {}, "_outpath": "/tmp/tmp.OE8aplsSUz/Miniconda3-py311_23.5.0-3-Linux-aarch64.sh" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-ppc64le.sh_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-ppc64le.sh_info.json index 7945d4bfd..b58cf6406 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-ppc64le.sh_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-ppc64le.sh_info.json @@ -469,4 +469,4 @@ "_has_conda": true, "_extra_envs_info": {}, "_outpath": "/tmp/tmp.qgu14dbZeQ/Miniconda3-py311_23.5.0-3-Linux-ppc64le.sh" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-s390x.sh_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-s390x.sh_info.json index 33f3accbd..6b82b2d21 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-s390x.sh_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-s390x.sh_info.json @@ -469,4 +469,4 @@ "_has_conda": true, "_extra_envs_info": {}, "_outpath": "/tmp/tmp.1cnPNDmqnV/Miniconda3-py311_23.5.0-3-Linux-s390x.sh" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-x86_64.sh_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-x86_64.sh_info.json index 9d083e0e8..b2af029fe 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-x86_64.sh_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Linux-x86_64.sh_info.json @@ -469,4 +469,4 @@ "_has_conda": true, "_extra_envs_info": {}, "_outpath": "/tmp/tmp.wgtYpqoBvk/Miniconda3-py311_23.5.0-3-Linux-x86_64.sh" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-arm64.pkg_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-arm64.pkg_info.json index 37b05418b..ac24ba5c7 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-arm64.pkg_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-arm64.pkg_info.json @@ -453,4 +453,4 @@ "_has_conda": true, "_extra_envs_info": {}, "_outpath": "/var/folders/24/8k48jl6d249_n_qfxwsl6xvm0000gn/T/tmp.1JY9Omf7Lx/Miniconda3-py311_23.5.0-3-MacOSX-arm64.pkg" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-arm64.sh_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-arm64.sh_info.json index 0f1458924..40b6315c9 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-arm64.sh_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-arm64.sh_info.json @@ -451,4 +451,4 @@ "_has_conda": true, "_extra_envs_info": {}, "_outpath": "/var/folders/24/8k48jl6d249_n_qfxwsl6xvm0000gn/T/tmp.OFl5PoZB8w/Miniconda3-py311_23.5.0-3-MacOSX-arm64.sh" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.pkg_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.pkg_info.json index c21a04dd8..cf450540a 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.pkg_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.pkg_info.json @@ -451,4 +451,4 @@ "_has_conda": true, "_extra_envs_info": {}, "_outpath": "/var/folders/24/8k48jl6d249_n_qfxwsl6xvm0000gn/T/tmp.FHUnk9hcUs/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.pkg" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.sh_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.sh_info.json index c0fd7ade6..765f53ff0 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.sh_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.sh_info.json @@ -449,4 +449,4 @@ "_has_conda": true, "_extra_envs_info": {}, "_outpath": "/var/folders/24/8k48jl6d249_n_qfxwsl6xvm0000gn/T/tmp.ZK1IwZhY5P/Miniconda3-py311_23.5.0-3-MacOSX-x86_64.sh" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Windows-x86_64.exe_info.json b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Windows-x86_64.exe_info.json index 5e826ab44..2f6720306 100644 --- a/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Windows-x86_64.exe_info.json +++ b/docs/source/miniconda_releases/23.5.0-3/Miniconda3-py311_23.5.0-3-Windows-x86_64.exe_info.json @@ -437,4 +437,4 @@ "_outpath": "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\tmp.p3WdKMJ2zI\\Miniconda3-py311_23.5.0-3-Windows-x86_64.exe", "pre_install_desc": "", "post_install_desc": "" -} \ No newline at end of file +} diff --git a/docs/source/miniconda_releases/23.5.1-0/changes.rst b/docs/source/miniconda_releases/23.5.1-0/changes.rst index 09a0678c4..620550b9a 100644 --- a/docs/source/miniconda_releases/23.5.1-0/changes.rst +++ b/docs/source/miniconda_releases/23.5.1-0/changes.rst @@ -1,4 +1,4 @@ User-Facing Changes ------------------- -* Conda has been updated to v23.5.1 (`conda issue 12873 `_). \ No newline at end of file +* Conda has been updated to v23.5.1 (`conda issue 12873 `_). diff --git a/docs/source/miniconda_releases/23.5.2-0/changes.rst b/docs/source/miniconda_releases/23.5.2-0/changes.rst index 5b57dc7e9..0117f97f0 100644 --- a/docs/source/miniconda_releases/23.5.2-0/changes.rst +++ b/docs/source/miniconda_releases/23.5.2-0/changes.rst @@ -1,4 +1,4 @@ User-Facing Changes ------------------- -* Conda has been updated to v23.5.2 (`conda issue 12836 `_). \ No newline at end of file +* Conda has been updated to v23.5.2 (`conda issue 12836 `_). diff --git a/requirements.rst b/requirements.rst index 6d4a5a6b0..3f165ac19 100644 --- a/requirements.rst +++ b/requirements.rst @@ -2,7 +2,7 @@ Conda requirements ================== -Conda requires the following: +Conda requires the following: 32 or 64-bit computer @@ -10,7 +10,6 @@ Windows, Macintosh, or Linux operating system Miniconda requires 32MB available, plus another 32MB to install -Anaconda requires 300+ MB for the download plus another 300+ to install - -NOTE: You do NOT need root privileges to install Anaconda if you select a user writable install location. +Anaconda requires 300+ MB for the download plus another 300+ to install +NOTE: You do NOT need root privileges to install Anaconda if you select a user writable install location. diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 000000000..c03b6566a --- /dev/null +++ b/setup.cfg @@ -0,0 +1,9 @@ +[flake8] +# see black+flake8 config +# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8 +max-line-length = 99 +# W503: line break before binary operator +extend-ignore = W503 + +[isort] +profile = black