From c849875356f0ca3b12257cd22a2a1c0bd1603884 Mon Sep 17 00:00:00 2001 From: wim glenn Date: Tue, 19 May 2020 00:52:04 -0500 Subject: use a less confusing example for requirements parsing --- docs/pkg_resources.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt index 71568c1a..f2e554f4 100644 --- a/docs/pkg_resources.txt +++ b/docs/pkg_resources.txt @@ -594,7 +594,7 @@ Requirements Parsing FooProject >= 1.2 Fizzy [foo, bar] - PickyThing<1.6,>1.9,!=1.9.6,<2.0a0,==2.4c1 + PickyThing>1.6,<=1.9,!=1.8.6 SomethingWhoseVersionIDontCareAbout SomethingWithMarker[foo]>1.0;python_version<"2.7" -- cgit v1.2.1 From 46dab46d6debf69331b646bff11052dc731d4ae4 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 24 May 2020 15:50:07 -0400 Subject: Add landing page for Python 2 sunset. Ref #2094. --- docs/python 2 sunset.txt | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 docs/python 2 sunset.txt (limited to 'docs') diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.txt new file mode 100644 index 00000000..543487d8 --- /dev/null +++ b/docs/python 2 sunset.txt @@ -0,0 +1,35 @@ +:orphan: + +Python 2 Sunset +=============== + +Since January 2020 and the release of Setuptools 45, Python 2 is no longer supported by the most current release (`discussion `_). Setuptools as a project continues to support Python 2 with bugfixes and important features on Setuptools 44.x. + +By design, most users will be unaffected by this change. That's because Setuptools 45 declares its supported Python versions to exclude Python 2.7, and installers such as pip 9 or later will honor this declaration and prevent installation of Setuptools 45 or later in Python 2 environments. + +Users that do import any portion of Setuptools 45 or later on Python 2 are directed to this documentation to provide guidance on how to work around the issues. + +Workarounds +----------- + +The best recommendation is to avoid Python 2 and move to Python 3 where possible. This project acknowledges that not all environments can drop Python 2 support, so provides other options. + +In less common scenarios, later versions of Setuptools can be installed on unsupported Python versions. In these environments, the installer is advised to first install ``setuptools<45`` to "pin Setuptools" to a compatible version. + +- When using older versions of pip (before 9.0), the ``Requires-Python`` directive is not honored and invalid versions can be installed. Users are advised first to upgrade pip and retry or to pin Setuptools. Use ``pip --version`` to determine the version of pip. +- When using ``easy_install``, ``Requires-Python`` is not honored and later versions can be installed. In this case, users are advised to pin Setuptools. This applies to ``setup.py install`` invocations as well, as they use Setuptools under the hood. + +It's still not working +---------------------- + +If after trying the above steps, the Python environment still has incompatible versions of Setuptools installed, here are some things to try. + +1. Uninstall and reinstall Setuptools. Run ``pip uninstall -y setuptools`` for the relevant environment. Repeat until there is no Setuptools installed. Then ``pip install setuptools``. + +2. If possible, attempt to replicate the problem in a second environment (virtual machine, friend's computer, etc). If the issue is isolated to just one unique enviornment, first determine what is different about those environments (or reinstall/reset the failing one to defaults). + +3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant application. Please be respectful by searching for existing issues and following the latest guidance before reaching out for support. If you do file an issue, be sure to give as much detail as possible to help the maintainers understand how you encountered the issue following their recommended guidance. + +4. Reach out to your local support groups. There's a good chance someone near you has the expertise and willingness to help. + +5. If all else fails, `file this template `_ with Setuptools. Please complete the whole template, providing as much detail about how you encountered the issue. Setuptools maintainers will summarily close tickets filed without any meaningful detail or engagement with the issue. -- cgit v1.2.1 From e23403355f87272c8b0c027b98bf18309c38fa31 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 24 May 2020 16:14:54 -0400 Subject: Prefer imperative voice --- docs/python 2 sunset.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.txt index 543487d8..6b8016fb 100644 --- a/docs/python 2 sunset.txt +++ b/docs/python 2 sunset.txt @@ -28,8 +28,8 @@ If after trying the above steps, the Python environment still has incompatible v 2. If possible, attempt to replicate the problem in a second environment (virtual machine, friend's computer, etc). If the issue is isolated to just one unique enviornment, first determine what is different about those environments (or reinstall/reset the failing one to defaults). -3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant application. Please be respectful by searching for existing issues and following the latest guidance before reaching out for support. If you do file an issue, be sure to give as much detail as possible to help the maintainers understand how you encountered the issue following their recommended guidance. +3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant application. Please be respectful by searching for existing issues and following the latest guidance before reaching out for support. When filing an issue, be sure to give as much detail as possible to help the maintainers understand what factors led to the issue after following their recommended guidance. -4. Reach out to your local support groups. There's a good chance someone near you has the expertise and willingness to help. +4. Reach out to your local support groups. There's a good chance someone nearby has the expertise and willingness to help. -5. If all else fails, `file this template `_ with Setuptools. Please complete the whole template, providing as much detail about how you encountered the issue. Setuptools maintainers will summarily close tickets filed without any meaningful detail or engagement with the issue. +5. If all else fails, `file this template `_ with Setuptools. Please complete the whole template, providing as much detail about what factors led to the issue. Setuptools maintainers will summarily close tickets filed without any meaningful detail or engagement with the issue. -- cgit v1.2.1 From 96f0781f08b3da918ffaafae656623c3c3152682 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 25 May 2020 10:39:33 -0400 Subject: Wrap lines and remove newlines between enumerated paragraphs. --- docs/python 2 sunset.txt | 68 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 17 deletions(-) (limited to 'docs') diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.txt index 6b8016fb..a6d768cb 100644 --- a/docs/python 2 sunset.txt +++ b/docs/python 2 sunset.txt @@ -3,33 +3,67 @@ Python 2 Sunset =============== -Since January 2020 and the release of Setuptools 45, Python 2 is no longer supported by the most current release (`discussion `_). Setuptools as a project continues to support Python 2 with bugfixes and important features on Setuptools 44.x. +Since January 2020 and the release of Setuptools 45, Python 2 is no longer +supported by the most current release (`discussion +`_). Setuptools as a project +continues to support Python 2 with bugfixes and important features on +Setuptools 44.x. -By design, most users will be unaffected by this change. That's because Setuptools 45 declares its supported Python versions to exclude Python 2.7, and installers such as pip 9 or later will honor this declaration and prevent installation of Setuptools 45 or later in Python 2 environments. +By design, most users will be unaffected by this change. That's because +Setuptools 45 declares its supported Python versions to exclude Python 2.7, +and installers such as pip 9 or later will honor this declaration and prevent +installation of Setuptools 45 or later in Python 2 environments. -Users that do import any portion of Setuptools 45 or later on Python 2 are directed to this documentation to provide guidance on how to work around the issues. +Users that do import any portion of Setuptools 45 or later on Python 2 are +directed to this documentation to provide guidance on how to work around the +issues. Workarounds ----------- -The best recommendation is to avoid Python 2 and move to Python 3 where possible. This project acknowledges that not all environments can drop Python 2 support, so provides other options. +The best recommendation is to avoid Python 2 and move to Python 3 where +possible. This project acknowledges that not all environments can drop Python +2 support, so provides other options. -In less common scenarios, later versions of Setuptools can be installed on unsupported Python versions. In these environments, the installer is advised to first install ``setuptools<45`` to "pin Setuptools" to a compatible version. +In less common scenarios, later versions of Setuptools can be installed on +unsupported Python versions. In these environments, the installer is advised +to first install ``setuptools<45`` to "pin Setuptools" to a compatible +version. -- When using older versions of pip (before 9.0), the ``Requires-Python`` directive is not honored and invalid versions can be installed. Users are advised first to upgrade pip and retry or to pin Setuptools. Use ``pip --version`` to determine the version of pip. -- When using ``easy_install``, ``Requires-Python`` is not honored and later versions can be installed. In this case, users are advised to pin Setuptools. This applies to ``setup.py install`` invocations as well, as they use Setuptools under the hood. +- When using older versions of pip (before 9.0), the ``Requires-Python`` + directive is not honored and invalid versions can be installed. Users are + advised first to upgrade pip and retry or to pin Setuptools. Use ``pip + --version`` to determine the version of pip. +- When using ``easy_install``, ``Requires-Python`` is not honored and later + versions can be installed. In this case, users are advised to pin + Setuptools. This applies to ``setup.py install`` invocations as well, as + they use Setuptools under the hood. It's still not working ---------------------- -If after trying the above steps, the Python environment still has incompatible versions of Setuptools installed, here are some things to try. +If after trying the above steps, the Python environment still has incompatible +versions of Setuptools installed, here are some things to try. -1. Uninstall and reinstall Setuptools. Run ``pip uninstall -y setuptools`` for the relevant environment. Repeat until there is no Setuptools installed. Then ``pip install setuptools``. - -2. If possible, attempt to replicate the problem in a second environment (virtual machine, friend's computer, etc). If the issue is isolated to just one unique enviornment, first determine what is different about those environments (or reinstall/reset the failing one to defaults). - -3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant application. Please be respectful by searching for existing issues and following the latest guidance before reaching out for support. When filing an issue, be sure to give as much detail as possible to help the maintainers understand what factors led to the issue after following their recommended guidance. - -4. Reach out to your local support groups. There's a good chance someone nearby has the expertise and willingness to help. - -5. If all else fails, `file this template `_ with Setuptools. Please complete the whole template, providing as much detail about what factors led to the issue. Setuptools maintainers will summarily close tickets filed without any meaningful detail or engagement with the issue. +1. Uninstall and reinstall Setuptools. Run ``pip uninstall -y setuptools`` for + the relevant environment. Repeat until there is no Setuptools installed. + Then ``pip install setuptools``. +2. If possible, attempt to replicate the problem in a second environment + (virtual machine, friend's computer, etc). If the issue is isolated to just + one unique enviornment, first determine what is different about those + environments (or reinstall/reset the failing one to defaults). +3. End users who are not themselves the maintainers for the package they are + trying to install should contact the support channels for the relevant + application. Please be respectful by searching for existing issues and + following the latest guidance before reaching out for support. When filing + an issue, be sure to give as much detail as possible to help the + maintainers understand what factors led to the issue after following their + recommended guidance. +4. Reach out to your local support groups. There's a good chance someone + nearby has the expertise and willingness to help. +5. If all else fails, `file this template + `_ + with Setuptools. Please complete the whole template, providing as much + detail about what factors led to the issue. Setuptools maintainers will + summarily close tickets filed without any meaningful detail or engagement + with the issue. -- cgit v1.2.1 From dbdd19d4212a35ac501c3f56987c035512ab6557 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 25 May 2020 10:40:09 -0400 Subject: s/respectful/considerate of those projects/ --- docs/python 2 sunset.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.txt index a6d768cb..f7b7ee25 100644 --- a/docs/python 2 sunset.txt +++ b/docs/python 2 sunset.txt @@ -54,11 +54,11 @@ versions of Setuptools installed, here are some things to try. environments (or reinstall/reset the failing one to defaults). 3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant - application. Please be respectful by searching for existing issues and - following the latest guidance before reaching out for support. When filing - an issue, be sure to give as much detail as possible to help the - maintainers understand what factors led to the issue after following their - recommended guidance. + application. Please be considerate of those projects by searching for + existing issues and following the latest guidance before reaching out for + support. When filing an issue, be sure to give as much detail as possible + to help the maintainers understand what factors led to the issue after + following their recommended guidance. 4. Reach out to your local support groups. There's a good chance someone nearby has the expertise and willingness to help. 5. If all else fails, `file this template -- cgit v1.2.1 From 96a1acb471eb8b2745a7ef98eceafb1671d7812c Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Wed, 27 May 2020 09:06:45 -0700 Subject: DOC: fix link missing > The `decalrative config`_ link present higher in the document is also unresolved, I'm not quite sure what the intended target was. --- docs/build_meta.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/build_meta.txt b/docs/build_meta.txt index ef9fb2ac..fcc2b7fe 100644 --- a/docs/build_meta.txt +++ b/docs/build_meta.txt @@ -68,7 +68,7 @@ Use ``setuptools``' `declarative config`_ to specify the package information:: Now generate the distribution. Although the PyPA is still working to `provide a recommended tool `_ -to build packages, the `pep517 package `_ provides this functionality. To build the package:: $ pip install -q pep517 -- cgit v1.2.1 From ca5e271eed022a492a60db8eed1e55e135d1210e Mon Sep 17 00:00:00 2001 From: Sumana Harihareswara Date: Thu, 28 May 2020 17:47:07 -0400 Subject: DOC: Update mailing list link Per https://groups.google.com/d/msg/pypa-dev/rUNsfIbruHM/LCEx-CB5AgAJ the pypa-dev Google Group is now decommissioned. Pointing to distutils-sig instead. Signed-off-by: Sumana Harihareswara --- docs/developer-guide.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt index e6171e4e..4a78e22e 100644 --- a/docs/developer-guide.txt +++ b/docs/developer-guide.txt @@ -23,16 +23,16 @@ contribution. Project Management ------------------ -Setuptools is maintained primarily in Github at `this home +Setuptools is maintained primarily in GitHub at `this home `_. Setuptools is maintained under the Python Packaging Authority (PyPA) with several core contributors. All bugs -for Setuptools are filed and the canonical source is maintained in Github. +for Setuptools are filed and the canonical source is maintained in GitHub. User support and discussions are done through the issue tracker (for specific) -issues, through the distutils-sig mailing list, or on IRC (Freenode) at +issues, through the `distutils-sig mailing list `_, or on IRC (Freenode) at #pypa. -Discussions about development happen on the pypa-dev mailing list or on +Discussions about development happen on the distutils-sig mailing list or on `Gitter `_. ----------------- @@ -44,7 +44,7 @@ describing the motivation behind making changes. First search to see if a ticket already exists for your issue. If not, create one. Try to think from the perspective of the reader. Explain what behavior you expected, what you got instead, and what factors might have contributed to the unexpected -behavior. In Github, surround a block of code or traceback with the triple +behavior. In GitHub, surround a block of code or traceback with the triple backtick "\`\`\`" so that it is formatted nicely. Filing a ticket provides a forum for justification, discussion, and -- cgit v1.2.1 From 94491a19ae999901b812fdf878c798cba11fc590 Mon Sep 17 00:00:00 2001 From: Samuel Watkins <35979561+slwatkins@users.noreply.github.com> Date: Tue, 16 Jun 2020 12:33:08 -0700 Subject: docs: fix typo in path to vendored.txt --- docs/developer-guide.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt index 4a78e22e..e84cd640 100644 --- a/docs/developer-guide.txt +++ b/docs/developer-guide.txt @@ -145,5 +145,5 @@ setuptools from source. Eventually, this limitation may be lifted as PEP 517/518 reach ubiquitous adoption, but for now, Setuptools cannot declare dependencies other than through ``setuptools/_vendor/vendored.txt`` and -``pkg_reosurces/_vendor/vendored.txt`` and refreshed by way of +``pkg_resources/_vendor/vendored.txt`` and refreshed by way of ``paver update_vendored`` (pavement.py). -- cgit v1.2.1 From 58cc03759ab225bfa9767cd04caf69ca014cd353 Mon Sep 17 00:00:00 2001 From: cajhne Date: Fri, 3 Jul 2020 21:30:43 +0100 Subject: Add logo resources --- docs/logo/README.md | 10 + docs/logo/josefinsans/.uuid | 1 + docs/logo/josefinsans/DESCRIPTION.en_us.html | 9 + docs/logo/josefinsans/JosefinSans-Bold.ttf | Bin 0 -> 86300 bytes docs/logo/josefinsans/JosefinSans-BoldItalic.ttf | Bin 0 -> 83100 bytes docs/logo/josefinsans/JosefinSans-Italic.ttf | Bin 0 -> 84916 bytes docs/logo/josefinsans/JosefinSans-Light.ttf | Bin 0 -> 87320 bytes docs/logo/josefinsans/JosefinSans-LightItalic.ttf | Bin 0 -> 85684 bytes docs/logo/josefinsans/JosefinSans-Regular.ttf | Bin 0 -> 87260 bytes docs/logo/josefinsans/JosefinSans-SemiBold.ttf | Bin 0 -> 87880 bytes .../josefinsans/JosefinSans-SemiBoldItalic.ttf | Bin 0 -> 84824 bytes docs/logo/josefinsans/JosefinSans-Thin.ttf | Bin 0 -> 88088 bytes docs/logo/josefinsans/JosefinSans-ThinItalic.ttf | Bin 0 -> 85420 bytes docs/logo/josefinsans/METADATA.pb | 99 +++++++++ docs/logo/josefinsans/OFL.txt | 93 +++++++++ docs/logo/setup_tools_logo_colour.svg | 227 +++++++++++++++++++++ docs/logo/setup_tools_logo_colour_1000px.png | Bin 0 -> 31520 bytes docs/logo/setup_tools_logo_colour_banner_1line.svg | 223 ++++++++++++++++++++ ...setup_tools_logo_colour_banner_1line_1000px.png | Bin 0 -> 24183 bytes .../logo/setup_tools_logo_colour_banner_2lines.svg | 224 ++++++++++++++++++++ ...etup_tools_logo_colour_banner_2lines_1000px.png | Bin 0 -> 38105 bytes docs/logo/setup_tools_logo_symbol_colour.svg | 203 ++++++++++++++++++ .../logo/setup_tools_logo_symbol_colour_1000px.png | Bin 0 -> 44239 bytes docs/logo/setup_tools_logotype_1line.svg | 169 +++++++++++++++ 24 files changed, 1258 insertions(+) create mode 100644 docs/logo/README.md create mode 100644 docs/logo/josefinsans/.uuid create mode 100644 docs/logo/josefinsans/DESCRIPTION.en_us.html create mode 100644 docs/logo/josefinsans/JosefinSans-Bold.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-BoldItalic.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-Italic.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-Light.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-LightItalic.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-Regular.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-SemiBold.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-Thin.ttf create mode 100644 docs/logo/josefinsans/JosefinSans-ThinItalic.ttf create mode 100644 docs/logo/josefinsans/METADATA.pb create mode 100644 docs/logo/josefinsans/OFL.txt create mode 100644 docs/logo/setup_tools_logo_colour.svg create mode 100644 docs/logo/setup_tools_logo_colour_1000px.png create mode 100644 docs/logo/setup_tools_logo_colour_banner_1line.svg create mode 100644 docs/logo/setup_tools_logo_colour_banner_1line_1000px.png create mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines.svg create mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png create mode 100644 docs/logo/setup_tools_logo_symbol_colour.svg create mode 100644 docs/logo/setup_tools_logo_symbol_colour_1000px.png create mode 100644 docs/logo/setup_tools_logotype_1line.svg (limited to 'docs') diff --git a/docs/logo/README.md b/docs/logo/README.md new file mode 100644 index 00000000..88e6647c --- /dev/null +++ b/docs/logo/README.md @@ -0,0 +1,10 @@ +![](setup_tools_logo_colour.svg) +### Design: + +SetupTools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the SetupTools project using the Free Open Source graphics editor [Inkscape](inkscape.org). + +### Copyright: +Logo is (c) the SetupTools developers. + +### Font: +The font used is the Open Font "Josefin Sans", which is available for free under the Open Font License (OFL). diff --git a/docs/logo/josefinsans/.uuid b/docs/logo/josefinsans/.uuid new file mode 100644 index 00000000..d7e92c77 --- /dev/null +++ b/docs/logo/josefinsans/.uuid @@ -0,0 +1 @@ +922c129c-9f4c-4831-b632-c7f43be6feb0 \ No newline at end of file diff --git a/docs/logo/josefinsans/DESCRIPTION.en_us.html b/docs/logo/josefinsans/DESCRIPTION.en_us.html new file mode 100644 index 00000000..9364b249 --- /dev/null +++ b/docs/logo/josefinsans/DESCRIPTION.en_us.html @@ -0,0 +1,9 @@ +

+The idea of this typeface is to be geometric, elegant, with a vintage feeling, for use at larger sizes. +It is inspired by geometric sans serif designs from the 1920s. +The x-height is half way from baseline to cap height, an unusual proportion. +

+

+There is a sister family, Josefin Slab +

+ diff --git a/docs/logo/josefinsans/JosefinSans-Bold.ttf b/docs/logo/josefinsans/JosefinSans-Bold.ttf new file mode 100644 index 00000000..12a7ad08 Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-Bold.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf b/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf new file mode 100644 index 00000000..4a0fc91d Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-Italic.ttf b/docs/logo/josefinsans/JosefinSans-Italic.ttf new file mode 100644 index 00000000..1cbe036e Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-Italic.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-Light.ttf b/docs/logo/josefinsans/JosefinSans-Light.ttf new file mode 100644 index 00000000..7fe3f7be Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-Light.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-LightItalic.ttf b/docs/logo/josefinsans/JosefinSans-LightItalic.ttf new file mode 100644 index 00000000..8dc35383 Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-LightItalic.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-Regular.ttf b/docs/logo/josefinsans/JosefinSans-Regular.ttf new file mode 100644 index 00000000..ed119008 Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-Regular.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-SemiBold.ttf b/docs/logo/josefinsans/JosefinSans-SemiBold.ttf new file mode 100644 index 00000000..b67504a6 Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-SemiBold.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf b/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf new file mode 100644 index 00000000..24a27d15 Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-Thin.ttf b/docs/logo/josefinsans/JosefinSans-Thin.ttf new file mode 100644 index 00000000..c54ca7f1 Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-Thin.ttf differ diff --git a/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf b/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf new file mode 100644 index 00000000..6840b7c2 Binary files /dev/null and b/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf differ diff --git a/docs/logo/josefinsans/METADATA.pb b/docs/logo/josefinsans/METADATA.pb new file mode 100644 index 00000000..8b67716c --- /dev/null +++ b/docs/logo/josefinsans/METADATA.pb @@ -0,0 +1,99 @@ +name: "Josefin Sans" +designer: "Santiago Orozco" +license: "OFL" +category: "SANS_SERIF" +date_added: "2010-11-17" +fonts { + name: "Josefin Sans" + style: "normal" + weight: 100 + filename: "JosefinSans-Thin.ttf" + post_script_name: "JosefinSans-Thin" + full_name: "Josefin Sans Thin" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "italic" + weight: 100 + filename: "JosefinSans-ThinItalic.ttf" + post_script_name: "JosefinSans-ThinItalic" + full_name: "Josefin Sans Thin Italic" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "normal" + weight: 300 + filename: "JosefinSans-Light.ttf" + post_script_name: "JosefinSans-Light" + full_name: "Josefin Sans Light" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "italic" + weight: 300 + filename: "JosefinSans-LightItalic.ttf" + post_script_name: "JosefinSans-LightItalic" + full_name: "Josefin Sans Light Italic" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "normal" + weight: 400 + filename: "JosefinSans-Regular.ttf" + post_script_name: "JosefinSans-Regular" + full_name: "Josefin Sans Regular" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "italic" + weight: 400 + filename: "JosefinSans-Italic.ttf" + post_script_name: "JosefinSans-Italic" + full_name: "Josefin Sans Italic" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "normal" + weight: 600 + filename: "JosefinSans-SemiBold.ttf" + post_script_name: "JosefinSans-SemiBold" + full_name: "Josefin Sans SemiBold" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "italic" + weight: 600 + filename: "JosefinSans-SemiBoldItalic.ttf" + post_script_name: "JosefinSans-SemiBoldItalic" + full_name: "Josefin Sans SemiBold Italic" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "normal" + weight: 700 + filename: "JosefinSans-Bold.ttf" + post_script_name: "JosefinSans-Bold" + full_name: "Josefin Sans Bold" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +fonts { + name: "Josefin Sans" + style: "italic" + weight: 700 + filename: "JosefinSans-BoldItalic.ttf" + post_script_name: "JosefinSans-BoldItalic" + full_name: "Josefin Sans Bold Italic" + copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." +} +subsets: "latin" +subsets: "latin-ext" +subsets: "menu" +subsets: "vietnamese" diff --git a/docs/logo/josefinsans/OFL.txt b/docs/logo/josefinsans/OFL.txt new file mode 100644 index 00000000..6586a7e3 --- /dev/null +++ b/docs/logo/josefinsans/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2010, Santiago Orozco (hi@typemade.mx) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/docs/logo/setup_tools_logo_colour.svg b/docs/logo/setup_tools_logo_colour.svg new file mode 100644 index 00000000..7eae8fc3 --- /dev/null +++ b/docs/logo/setup_tools_logo_colour.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_colour_1000px.png b/docs/logo/setup_tools_logo_colour_1000px.png new file mode 100644 index 00000000..c25a23b9 Binary files /dev/null and b/docs/logo/setup_tools_logo_colour_1000px.png differ diff --git a/docs/logo/setup_tools_logo_colour_banner_1line.svg b/docs/logo/setup_tools_logo_colour_banner_1line.svg new file mode 100644 index 00000000..d6dc9aac --- /dev/null +++ b/docs/logo/setup_tools_logo_colour_banner_1line.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png new file mode 100644 index 00000000..d1604289 Binary files /dev/null and b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png differ diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines.svg b/docs/logo/setup_tools_logo_colour_banner_2lines.svg new file mode 100644 index 00000000..991577fb --- /dev/null +++ b/docs/logo/setup_tools_logo_colour_banner_2lines.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png new file mode 100644 index 00000000..89370a9d Binary files /dev/null and b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png differ diff --git a/docs/logo/setup_tools_logo_symbol_colour.svg b/docs/logo/setup_tools_logo_symbol_colour.svg new file mode 100644 index 00000000..2936cbb5 --- /dev/null +++ b/docs/logo/setup_tools_logo_symbol_colour.svg @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_symbol_colour_1000px.png b/docs/logo/setup_tools_logo_symbol_colour_1000px.png new file mode 100644 index 00000000..e0c36fc1 Binary files /dev/null and b/docs/logo/setup_tools_logo_symbol_colour_1000px.png differ diff --git a/docs/logo/setup_tools_logotype_1line.svg b/docs/logo/setup_tools_logotype_1line.svg new file mode 100644 index 00000000..dbb9c1de --- /dev/null +++ b/docs/logo/setup_tools_logotype_1line.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + -- cgit v1.2.1 From 223b405e1433751dfb695dcb99b124e46c716a2a Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 4 Jul 2020 11:25:28 -0400 Subject: Use lowercase 't' for consistency in branding. --- docs/logo/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/logo/README.md b/docs/logo/README.md index 88e6647c..74fadbf0 100644 --- a/docs/logo/README.md +++ b/docs/logo/README.md @@ -1,10 +1,10 @@ ![](setup_tools_logo_colour.svg) ### Design: -SetupTools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the SetupTools project using the Free Open Source graphics editor [Inkscape](inkscape.org). +Setuptools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the Setuptools project using the Free Open Source graphics editor [Inkscape](inkscape.org). ### Copyright: -Logo is (c) the SetupTools developers. +Logo is (c) the Setuptools developers. ### Font: The font used is the Open Font "Josefin Sans", which is available for free under the Open Font License (OFL). -- cgit v1.2.1 From fd94cd038d644ff27866301f6f365a3ef0901898 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 4 Jul 2020 11:43:46 -0400 Subject: Rename logo assets to remove project name and 'logo', which are implied by the context. --- docs/logo/banner 1 line color.png | Bin 0 -> 24183 bytes docs/logo/banner 1 line color.svg | 223 ++++++++++++++++++++ docs/logo/banner 2 lines color.png | Bin 0 -> 38105 bytes docs/logo/banner 2 lines color.svg | 224 ++++++++++++++++++++ docs/logo/full color 1000px.png | Bin 0 -> 31520 bytes docs/logo/full color.svg | 227 +++++++++++++++++++++ docs/logo/setup_tools_logo_colour.svg | 227 --------------------- docs/logo/setup_tools_logo_colour_1000px.png | Bin 31520 -> 0 bytes docs/logo/setup_tools_logo_colour_banner_1line.svg | 223 -------------------- ...setup_tools_logo_colour_banner_1line_1000px.png | Bin 24183 -> 0 bytes .../logo/setup_tools_logo_colour_banner_2lines.svg | 224 -------------------- ...etup_tools_logo_colour_banner_2lines_1000px.png | Bin 38105 -> 0 bytes docs/logo/setup_tools_logo_symbol_colour.svg | 203 ------------------ .../logo/setup_tools_logo_symbol_colour_1000px.png | Bin 44239 -> 0 bytes docs/logo/setup_tools_logotype_1line.svg | 169 --------------- docs/logo/symbol color 1000px.png | Bin 0 -> 44239 bytes docs/logo/symbol color.svg | 203 ++++++++++++++++++ docs/logo/type.svg | 169 +++++++++++++++ 18 files changed, 1046 insertions(+), 1046 deletions(-) create mode 100644 docs/logo/banner 1 line color.png create mode 100644 docs/logo/banner 1 line color.svg create mode 100644 docs/logo/banner 2 lines color.png create mode 100644 docs/logo/banner 2 lines color.svg create mode 100644 docs/logo/full color 1000px.png create mode 100644 docs/logo/full color.svg delete mode 100644 docs/logo/setup_tools_logo_colour.svg delete mode 100644 docs/logo/setup_tools_logo_colour_1000px.png delete mode 100644 docs/logo/setup_tools_logo_colour_banner_1line.svg delete mode 100644 docs/logo/setup_tools_logo_colour_banner_1line_1000px.png delete mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines.svg delete mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png delete mode 100644 docs/logo/setup_tools_logo_symbol_colour.svg delete mode 100644 docs/logo/setup_tools_logo_symbol_colour_1000px.png delete mode 100644 docs/logo/setup_tools_logotype_1line.svg create mode 100644 docs/logo/symbol color 1000px.png create mode 100644 docs/logo/symbol color.svg create mode 100644 docs/logo/type.svg (limited to 'docs') diff --git a/docs/logo/banner 1 line color.png b/docs/logo/banner 1 line color.png new file mode 100644 index 00000000..d1604289 Binary files /dev/null and b/docs/logo/banner 1 line color.png differ diff --git a/docs/logo/banner 1 line color.svg b/docs/logo/banner 1 line color.svg new file mode 100644 index 00000000..d6dc9aac --- /dev/null +++ b/docs/logo/banner 1 line color.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/banner 2 lines color.png b/docs/logo/banner 2 lines color.png new file mode 100644 index 00000000..89370a9d Binary files /dev/null and b/docs/logo/banner 2 lines color.png differ diff --git a/docs/logo/banner 2 lines color.svg b/docs/logo/banner 2 lines color.svg new file mode 100644 index 00000000..991577fb --- /dev/null +++ b/docs/logo/banner 2 lines color.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/full color 1000px.png b/docs/logo/full color 1000px.png new file mode 100644 index 00000000..c25a23b9 Binary files /dev/null and b/docs/logo/full color 1000px.png differ diff --git a/docs/logo/full color.svg b/docs/logo/full color.svg new file mode 100644 index 00000000..7eae8fc3 --- /dev/null +++ b/docs/logo/full color.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_colour.svg b/docs/logo/setup_tools_logo_colour.svg deleted file mode 100644 index 7eae8fc3..00000000 --- a/docs/logo/setup_tools_logo_colour.svg +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_colour_1000px.png b/docs/logo/setup_tools_logo_colour_1000px.png deleted file mode 100644 index c25a23b9..00000000 Binary files a/docs/logo/setup_tools_logo_colour_1000px.png and /dev/null differ diff --git a/docs/logo/setup_tools_logo_colour_banner_1line.svg b/docs/logo/setup_tools_logo_colour_banner_1line.svg deleted file mode 100644 index d6dc9aac..00000000 --- a/docs/logo/setup_tools_logo_colour_banner_1line.svg +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png deleted file mode 100644 index d1604289..00000000 Binary files a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png and /dev/null differ diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines.svg b/docs/logo/setup_tools_logo_colour_banner_2lines.svg deleted file mode 100644 index 991577fb..00000000 --- a/docs/logo/setup_tools_logo_colour_banner_2lines.svg +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png deleted file mode 100644 index 89370a9d..00000000 Binary files a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png and /dev/null differ diff --git a/docs/logo/setup_tools_logo_symbol_colour.svg b/docs/logo/setup_tools_logo_symbol_colour.svg deleted file mode 100644 index 2936cbb5..00000000 --- a/docs/logo/setup_tools_logo_symbol_colour.svg +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_symbol_colour_1000px.png b/docs/logo/setup_tools_logo_symbol_colour_1000px.png deleted file mode 100644 index e0c36fc1..00000000 Binary files a/docs/logo/setup_tools_logo_symbol_colour_1000px.png and /dev/null differ diff --git a/docs/logo/setup_tools_logotype_1line.svg b/docs/logo/setup_tools_logotype_1line.svg deleted file mode 100644 index dbb9c1de..00000000 --- a/docs/logo/setup_tools_logotype_1line.svg +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/docs/logo/symbol color 1000px.png b/docs/logo/symbol color 1000px.png new file mode 100644 index 00000000..e0c36fc1 Binary files /dev/null and b/docs/logo/symbol color 1000px.png differ diff --git a/docs/logo/symbol color.svg b/docs/logo/symbol color.svg new file mode 100644 index 00000000..2936cbb5 --- /dev/null +++ b/docs/logo/symbol color.svg @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/docs/logo/type.svg b/docs/logo/type.svg new file mode 100644 index 00000000..dbb9c1de --- /dev/null +++ b/docs/logo/type.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + -- cgit v1.2.1 From 0f491dc2b4141a17475eec12b02d8f237d7f7918 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 4 Jul 2020 11:57:44 -0400 Subject: Add banner to main docs page --- docs/index.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/index.txt b/docs/index.txt index 13a46e74..f3f65cb4 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -1,5 +1,8 @@ -Welcome to Setuptools' documentation! -===================================== +.. image:: https://raw.githubusercontent.com/pypa/setuptools/master/docs/logo/banner%201%20line%20color.svg + + +Documentation +============= Setuptools is a fully-featured, actively-maintained, and stable library designed to facilitate packaging Python projects, where packaging includes: -- cgit v1.2.1 From 5e179ffca0a6ed5f3369139baaea61094df38524 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 4 Jul 2020 11:59:16 -0400 Subject: Remove stale description of packaging. --- docs/index.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/index.txt b/docs/index.txt index f3f65cb4..228f97c8 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -5,14 +5,7 @@ Documentation ============= Setuptools is a fully-featured, actively-maintained, and stable library -designed to facilitate packaging Python projects, where packaging includes: - - - Python package and module definitions - - Distribution package metadata - - Test hooks - - Project installation - - Platform-specific details - - Python 3 support +designed to facilitate packaging Python projects. Documentation content: -- cgit v1.2.1 From bec11f03ab81da8af69909697925166793893e07 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 18 Jul 2020 13:46:01 -0400 Subject: Add docs on porting from distutils. --- docs/distutils-legacy.txt | 25 +++++++++++++++++++++++++ docs/index.txt | 1 + 2 files changed, 26 insertions(+) create mode 100644 docs/distutils-legacy.txt (limited to 'docs') diff --git a/docs/distutils-legacy.txt b/docs/distutils-legacy.txt new file mode 100644 index 00000000..a5d96260 --- /dev/null +++ b/docs/distutils-legacy.txt @@ -0,0 +1,25 @@ +Porting from Distutils +====================== + +Setuptools and the PyPA have a `stated goal `_ to make Setuptools the reference API for distutils. + +Since the 49.1.2 release, Setuptools includes a local, vendored copy of distutils (from late copies of CPython) that is disabled by default. To enable the use of this copy of distutils when invoking setuptools, set the enviroment variable: + + SETUPTOOLS_USE_DISTUTILS=local + +This behavior is planned to become the default. + +Prefer Setuptools +----------------- + +As Distutils is deprecated, any usage of functions or objects from distutils is similarly discouraged, and Setuptools aims to replace or deprecate all such uses. This section describes the recommended replacements. + +``distutils.core.setup`` → ``setuptools.setup`` + +``distutils.cmd.Command`` → ``setuptools.Command`` + +``distutils.log`` → (no replacement yet) + +``distutils.version.*`` → ``packaging.version.*`` + +If a project relies on uses of ``distutils`` that do not have a suitable replacement above, please search the `Setuptools issue tracker `_ and file a request, describing the use-case so that Setuptools' maintainers can investigate. Please provide enough detail to help the maintainers understand how distutils is used, what value it provides, and why that behavior should be supported. diff --git a/docs/index.txt b/docs/index.txt index 228f97c8..0dd5fd94 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -18,4 +18,5 @@ Documentation content: development roadmap Deprecated: Easy Install + distutils-legacy history -- cgit v1.2.1 From 2bf12c542af74c6e8b76ffd864c95c2efd94d372 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 Jul 2020 21:08:56 -0400 Subject: Revert "Rename logo assets to remove project name and 'logo', which are implied by the context." This reverts commit fd94cd038d644ff27866301f6f365a3ef0901898. --- docs/logo/banner 1 line color.png | Bin 24183 -> 0 bytes docs/logo/banner 1 line color.svg | 223 -------------------- docs/logo/banner 2 lines color.png | Bin 38105 -> 0 bytes docs/logo/banner 2 lines color.svg | 224 -------------------- docs/logo/full color 1000px.png | Bin 31520 -> 0 bytes docs/logo/full color.svg | 227 --------------------- docs/logo/setup_tools_logo_colour.svg | 227 +++++++++++++++++++++ docs/logo/setup_tools_logo_colour_1000px.png | Bin 0 -> 31520 bytes docs/logo/setup_tools_logo_colour_banner_1line.svg | 223 ++++++++++++++++++++ ...setup_tools_logo_colour_banner_1line_1000px.png | Bin 0 -> 24183 bytes .../logo/setup_tools_logo_colour_banner_2lines.svg | 224 ++++++++++++++++++++ ...etup_tools_logo_colour_banner_2lines_1000px.png | Bin 0 -> 38105 bytes docs/logo/setup_tools_logo_symbol_colour.svg | 203 ++++++++++++++++++ .../logo/setup_tools_logo_symbol_colour_1000px.png | Bin 0 -> 44239 bytes docs/logo/setup_tools_logotype_1line.svg | 169 +++++++++++++++ docs/logo/symbol color 1000px.png | Bin 44239 -> 0 bytes docs/logo/symbol color.svg | 203 ------------------ docs/logo/type.svg | 169 --------------- 18 files changed, 1046 insertions(+), 1046 deletions(-) delete mode 100644 docs/logo/banner 1 line color.png delete mode 100644 docs/logo/banner 1 line color.svg delete mode 100644 docs/logo/banner 2 lines color.png delete mode 100644 docs/logo/banner 2 lines color.svg delete mode 100644 docs/logo/full color 1000px.png delete mode 100644 docs/logo/full color.svg create mode 100644 docs/logo/setup_tools_logo_colour.svg create mode 100644 docs/logo/setup_tools_logo_colour_1000px.png create mode 100644 docs/logo/setup_tools_logo_colour_banner_1line.svg create mode 100644 docs/logo/setup_tools_logo_colour_banner_1line_1000px.png create mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines.svg create mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png create mode 100644 docs/logo/setup_tools_logo_symbol_colour.svg create mode 100644 docs/logo/setup_tools_logo_symbol_colour_1000px.png create mode 100644 docs/logo/setup_tools_logotype_1line.svg delete mode 100644 docs/logo/symbol color 1000px.png delete mode 100644 docs/logo/symbol color.svg delete mode 100644 docs/logo/type.svg (limited to 'docs') diff --git a/docs/logo/banner 1 line color.png b/docs/logo/banner 1 line color.png deleted file mode 100644 index d1604289..00000000 Binary files a/docs/logo/banner 1 line color.png and /dev/null differ diff --git a/docs/logo/banner 1 line color.svg b/docs/logo/banner 1 line color.svg deleted file mode 100644 index d6dc9aac..00000000 --- a/docs/logo/banner 1 line color.svg +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/banner 2 lines color.png b/docs/logo/banner 2 lines color.png deleted file mode 100644 index 89370a9d..00000000 Binary files a/docs/logo/banner 2 lines color.png and /dev/null differ diff --git a/docs/logo/banner 2 lines color.svg b/docs/logo/banner 2 lines color.svg deleted file mode 100644 index 991577fb..00000000 --- a/docs/logo/banner 2 lines color.svg +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/full color 1000px.png b/docs/logo/full color 1000px.png deleted file mode 100644 index c25a23b9..00000000 Binary files a/docs/logo/full color 1000px.png and /dev/null differ diff --git a/docs/logo/full color.svg b/docs/logo/full color.svg deleted file mode 100644 index 7eae8fc3..00000000 --- a/docs/logo/full color.svg +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_colour.svg b/docs/logo/setup_tools_logo_colour.svg new file mode 100644 index 00000000..7eae8fc3 --- /dev/null +++ b/docs/logo/setup_tools_logo_colour.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_colour_1000px.png b/docs/logo/setup_tools_logo_colour_1000px.png new file mode 100644 index 00000000..c25a23b9 Binary files /dev/null and b/docs/logo/setup_tools_logo_colour_1000px.png differ diff --git a/docs/logo/setup_tools_logo_colour_banner_1line.svg b/docs/logo/setup_tools_logo_colour_banner_1line.svg new file mode 100644 index 00000000..d6dc9aac --- /dev/null +++ b/docs/logo/setup_tools_logo_colour_banner_1line.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png new file mode 100644 index 00000000..d1604289 Binary files /dev/null and b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png differ diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines.svg b/docs/logo/setup_tools_logo_colour_banner_2lines.svg new file mode 100644 index 00000000..991577fb --- /dev/null +++ b/docs/logo/setup_tools_logo_colour_banner_2lines.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png new file mode 100644 index 00000000..89370a9d Binary files /dev/null and b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png differ diff --git a/docs/logo/setup_tools_logo_symbol_colour.svg b/docs/logo/setup_tools_logo_symbol_colour.svg new file mode 100644 index 00000000..2936cbb5 --- /dev/null +++ b/docs/logo/setup_tools_logo_symbol_colour.svg @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/docs/logo/setup_tools_logo_symbol_colour_1000px.png b/docs/logo/setup_tools_logo_symbol_colour_1000px.png new file mode 100644 index 00000000..e0c36fc1 Binary files /dev/null and b/docs/logo/setup_tools_logo_symbol_colour_1000px.png differ diff --git a/docs/logo/setup_tools_logotype_1line.svg b/docs/logo/setup_tools_logotype_1line.svg new file mode 100644 index 00000000..dbb9c1de --- /dev/null +++ b/docs/logo/setup_tools_logotype_1line.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/docs/logo/symbol color 1000px.png b/docs/logo/symbol color 1000px.png deleted file mode 100644 index e0c36fc1..00000000 Binary files a/docs/logo/symbol color 1000px.png and /dev/null differ diff --git a/docs/logo/symbol color.svg b/docs/logo/symbol color.svg deleted file mode 100644 index 2936cbb5..00000000 --- a/docs/logo/symbol color.svg +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/docs/logo/type.svg b/docs/logo/type.svg deleted file mode 100644 index dbb9c1de..00000000 --- a/docs/logo/type.svg +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - -- cgit v1.2.1 From 9dd762c61bdea4491f62c2b812b5cd5672821154 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 Jul 2020 21:11:16 -0400 Subject: Revert "Merge pull request #2229 from cajhne/logo001" This reverts commit 402880a7aed5dea1cf3a84af2b8291e451fb3d9f, reversing changes made to bd1102648109c85c782286787e4d5290ae280abe. --- docs/logo/README.md | 10 - docs/logo/josefinsans/.uuid | 1 - docs/logo/josefinsans/DESCRIPTION.en_us.html | 9 - docs/logo/josefinsans/JosefinSans-Bold.ttf | Bin 86300 -> 0 bytes docs/logo/josefinsans/JosefinSans-BoldItalic.ttf | Bin 83100 -> 0 bytes docs/logo/josefinsans/JosefinSans-Italic.ttf | Bin 84916 -> 0 bytes docs/logo/josefinsans/JosefinSans-Light.ttf | Bin 87320 -> 0 bytes docs/logo/josefinsans/JosefinSans-LightItalic.ttf | Bin 85684 -> 0 bytes docs/logo/josefinsans/JosefinSans-Regular.ttf | Bin 87260 -> 0 bytes docs/logo/josefinsans/JosefinSans-SemiBold.ttf | Bin 87880 -> 0 bytes .../josefinsans/JosefinSans-SemiBoldItalic.ttf | Bin 84824 -> 0 bytes docs/logo/josefinsans/JosefinSans-Thin.ttf | Bin 88088 -> 0 bytes docs/logo/josefinsans/JosefinSans-ThinItalic.ttf | Bin 85420 -> 0 bytes docs/logo/josefinsans/METADATA.pb | 99 --------- docs/logo/josefinsans/OFL.txt | 93 --------- docs/logo/setup_tools_logo_colour.svg | 227 --------------------- docs/logo/setup_tools_logo_colour_1000px.png | Bin 31520 -> 0 bytes docs/logo/setup_tools_logo_colour_banner_1line.svg | 223 -------------------- ...setup_tools_logo_colour_banner_1line_1000px.png | Bin 24183 -> 0 bytes .../logo/setup_tools_logo_colour_banner_2lines.svg | 224 -------------------- ...etup_tools_logo_colour_banner_2lines_1000px.png | Bin 38105 -> 0 bytes docs/logo/setup_tools_logo_symbol_colour.svg | 203 ------------------ .../logo/setup_tools_logo_symbol_colour_1000px.png | Bin 44239 -> 0 bytes docs/logo/setup_tools_logotype_1line.svg | 169 --------------- 24 files changed, 1258 deletions(-) delete mode 100644 docs/logo/README.md delete mode 100644 docs/logo/josefinsans/.uuid delete mode 100644 docs/logo/josefinsans/DESCRIPTION.en_us.html delete mode 100644 docs/logo/josefinsans/JosefinSans-Bold.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-BoldItalic.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-Italic.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-Light.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-LightItalic.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-Regular.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-SemiBold.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-Thin.ttf delete mode 100644 docs/logo/josefinsans/JosefinSans-ThinItalic.ttf delete mode 100644 docs/logo/josefinsans/METADATA.pb delete mode 100644 docs/logo/josefinsans/OFL.txt delete mode 100644 docs/logo/setup_tools_logo_colour.svg delete mode 100644 docs/logo/setup_tools_logo_colour_1000px.png delete mode 100644 docs/logo/setup_tools_logo_colour_banner_1line.svg delete mode 100644 docs/logo/setup_tools_logo_colour_banner_1line_1000px.png delete mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines.svg delete mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png delete mode 100644 docs/logo/setup_tools_logo_symbol_colour.svg delete mode 100644 docs/logo/setup_tools_logo_symbol_colour_1000px.png delete mode 100644 docs/logo/setup_tools_logotype_1line.svg (limited to 'docs') diff --git a/docs/logo/README.md b/docs/logo/README.md deleted file mode 100644 index 74fadbf0..00000000 --- a/docs/logo/README.md +++ /dev/null @@ -1,10 +0,0 @@ -![](setup_tools_logo_colour.svg) -### Design: - -Setuptools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the Setuptools project using the Free Open Source graphics editor [Inkscape](inkscape.org). - -### Copyright: -Logo is (c) the Setuptools developers. - -### Font: -The font used is the Open Font "Josefin Sans", which is available for free under the Open Font License (OFL). diff --git a/docs/logo/josefinsans/.uuid b/docs/logo/josefinsans/.uuid deleted file mode 100644 index d7e92c77..00000000 --- a/docs/logo/josefinsans/.uuid +++ /dev/null @@ -1 +0,0 @@ -922c129c-9f4c-4831-b632-c7f43be6feb0 \ No newline at end of file diff --git a/docs/logo/josefinsans/DESCRIPTION.en_us.html b/docs/logo/josefinsans/DESCRIPTION.en_us.html deleted file mode 100644 index 9364b249..00000000 --- a/docs/logo/josefinsans/DESCRIPTION.en_us.html +++ /dev/null @@ -1,9 +0,0 @@ -

-The idea of this typeface is to be geometric, elegant, with a vintage feeling, for use at larger sizes. -It is inspired by geometric sans serif designs from the 1920s. -The x-height is half way from baseline to cap height, an unusual proportion. -

-

-There is a sister family, Josefin Slab -

- diff --git a/docs/logo/josefinsans/JosefinSans-Bold.ttf b/docs/logo/josefinsans/JosefinSans-Bold.ttf deleted file mode 100644 index 12a7ad08..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-Bold.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf b/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf deleted file mode 100644 index 4a0fc91d..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-Italic.ttf b/docs/logo/josefinsans/JosefinSans-Italic.ttf deleted file mode 100644 index 1cbe036e..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-Italic.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-Light.ttf b/docs/logo/josefinsans/JosefinSans-Light.ttf deleted file mode 100644 index 7fe3f7be..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-Light.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-LightItalic.ttf b/docs/logo/josefinsans/JosefinSans-LightItalic.ttf deleted file mode 100644 index 8dc35383..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-LightItalic.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-Regular.ttf b/docs/logo/josefinsans/JosefinSans-Regular.ttf deleted file mode 100644 index ed119008..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-Regular.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-SemiBold.ttf b/docs/logo/josefinsans/JosefinSans-SemiBold.ttf deleted file mode 100644 index b67504a6..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-SemiBold.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf b/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf deleted file mode 100644 index 24a27d15..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-Thin.ttf b/docs/logo/josefinsans/JosefinSans-Thin.ttf deleted file mode 100644 index c54ca7f1..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-Thin.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf b/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf deleted file mode 100644 index 6840b7c2..00000000 Binary files a/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf and /dev/null differ diff --git a/docs/logo/josefinsans/METADATA.pb b/docs/logo/josefinsans/METADATA.pb deleted file mode 100644 index 8b67716c..00000000 --- a/docs/logo/josefinsans/METADATA.pb +++ /dev/null @@ -1,99 +0,0 @@ -name: "Josefin Sans" -designer: "Santiago Orozco" -license: "OFL" -category: "SANS_SERIF" -date_added: "2010-11-17" -fonts { - name: "Josefin Sans" - style: "normal" - weight: 100 - filename: "JosefinSans-Thin.ttf" - post_script_name: "JosefinSans-Thin" - full_name: "Josefin Sans Thin" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "italic" - weight: 100 - filename: "JosefinSans-ThinItalic.ttf" - post_script_name: "JosefinSans-ThinItalic" - full_name: "Josefin Sans Thin Italic" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "normal" - weight: 300 - filename: "JosefinSans-Light.ttf" - post_script_name: "JosefinSans-Light" - full_name: "Josefin Sans Light" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "italic" - weight: 300 - filename: "JosefinSans-LightItalic.ttf" - post_script_name: "JosefinSans-LightItalic" - full_name: "Josefin Sans Light Italic" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "normal" - weight: 400 - filename: "JosefinSans-Regular.ttf" - post_script_name: "JosefinSans-Regular" - full_name: "Josefin Sans Regular" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "italic" - weight: 400 - filename: "JosefinSans-Italic.ttf" - post_script_name: "JosefinSans-Italic" - full_name: "Josefin Sans Italic" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "normal" - weight: 600 - filename: "JosefinSans-SemiBold.ttf" - post_script_name: "JosefinSans-SemiBold" - full_name: "Josefin Sans SemiBold" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "italic" - weight: 600 - filename: "JosefinSans-SemiBoldItalic.ttf" - post_script_name: "JosefinSans-SemiBoldItalic" - full_name: "Josefin Sans SemiBold Italic" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "normal" - weight: 700 - filename: "JosefinSans-Bold.ttf" - post_script_name: "JosefinSans-Bold" - full_name: "Josefin Sans Bold" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -fonts { - name: "Josefin Sans" - style: "italic" - weight: 700 - filename: "JosefinSans-BoldItalic.ttf" - post_script_name: "JosefinSans-BoldItalic" - full_name: "Josefin Sans Bold Italic" - copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"." -} -subsets: "latin" -subsets: "latin-ext" -subsets: "menu" -subsets: "vietnamese" diff --git a/docs/logo/josefinsans/OFL.txt b/docs/logo/josefinsans/OFL.txt deleted file mode 100644 index 6586a7e3..00000000 --- a/docs/logo/josefinsans/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2010, Santiago Orozco (hi@typemade.mx) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/docs/logo/setup_tools_logo_colour.svg b/docs/logo/setup_tools_logo_colour.svg deleted file mode 100644 index 7eae8fc3..00000000 --- a/docs/logo/setup_tools_logo_colour.svg +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_colour_1000px.png b/docs/logo/setup_tools_logo_colour_1000px.png deleted file mode 100644 index c25a23b9..00000000 Binary files a/docs/logo/setup_tools_logo_colour_1000px.png and /dev/null differ diff --git a/docs/logo/setup_tools_logo_colour_banner_1line.svg b/docs/logo/setup_tools_logo_colour_banner_1line.svg deleted file mode 100644 index d6dc9aac..00000000 --- a/docs/logo/setup_tools_logo_colour_banner_1line.svg +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png deleted file mode 100644 index d1604289..00000000 Binary files a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png and /dev/null differ diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines.svg b/docs/logo/setup_tools_logo_colour_banner_2lines.svg deleted file mode 100644 index 991577fb..00000000 --- a/docs/logo/setup_tools_logo_colour_banner_2lines.svg +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png deleted file mode 100644 index 89370a9d..00000000 Binary files a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png and /dev/null differ diff --git a/docs/logo/setup_tools_logo_symbol_colour.svg b/docs/logo/setup_tools_logo_symbol_colour.svg deleted file mode 100644 index 2936cbb5..00000000 --- a/docs/logo/setup_tools_logo_symbol_colour.svg +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/docs/logo/setup_tools_logo_symbol_colour_1000px.png b/docs/logo/setup_tools_logo_symbol_colour_1000px.png deleted file mode 100644 index e0c36fc1..00000000 Binary files a/docs/logo/setup_tools_logo_symbol_colour_1000px.png and /dev/null differ diff --git a/docs/logo/setup_tools_logotype_1line.svg b/docs/logo/setup_tools_logotype_1line.svg deleted file mode 100644 index dbb9c1de..00000000 --- a/docs/logo/setup_tools_logotype_1line.svg +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - -- cgit v1.2.1 From 1b22ebc1cea9da7f377a260821e6cb1781df527c Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 Jul 2020 21:24:06 -0400 Subject: Revert "Add banner to main docs page" This reverts commit 0f491dc2b4141a17475eec12b02d8f237d7f7918. --- docs/index.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'docs') diff --git a/docs/index.txt b/docs/index.txt index 228f97c8..fc111a99 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -1,6 +1,3 @@ -.. image:: https://raw.githubusercontent.com/pypa/setuptools/master/docs/logo/banner%201%20line%20color.svg - - Documentation ============= -- cgit v1.2.1 From 44ca8aa51c39bea0c68444389d6ec215bcf98d02 Mon Sep 17 00:00:00 2001 From: Athos Ribeiro Date: Tue, 4 Aug 2020 10:31:11 +0200 Subject: Improve safe_version documentation --- docs/pkg_resources.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt index f2e554f4..7d0d8da9 100644 --- a/docs/pkg_resources.txt +++ b/docs/pkg_resources.txt @@ -1596,12 +1596,12 @@ Parsing Utilities See ``to_filename()``. ``safe_version(version)`` - This will return the normalized form of any PEP 440 version, if the version - string is not PEP 440 compatible than it is similar to ``safe_name()`` - except that spaces in the input become dots, and dots are allowed to exist - in the output. As with ``safe_name()``, if you are generating a filename - from this you should replace any "-" characters in the output with - underscores. + This will return the normalized form of any PEP 440 version. If the version + string is not PEP 440 compatible, this function behaves similar to + ``safe_name()`` except that spaces in the input become dots, and dots are + allowed to exist in the output. As with ``safe_name()``, if you are + generating a filename from this you should replace any "-" characters in + the output with underscores. ``safe_extra(extra)`` Return a "safe" form of an extra's name, suitable for use in a requirement -- cgit v1.2.1 From 485703c854f59d226c2f231e7c5f4f91263a4463 Mon Sep 17 00:00:00 2001 From: raimon Date: Sat, 8 Aug 2020 20:33:27 +0900 Subject: Provide consistency in the description of setup.cfg --- docs/setuptools.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/setuptools.txt b/docs/setuptools.txt index 7e0914b7..d60c87a0 100644 --- a/docs/setuptools.txt +++ b/docs/setuptools.txt @@ -1988,11 +1988,11 @@ boilerplate code in some cases. include_package_data = True packages = find: scripts = - bin/first.py - bin/second.py + bin/first.py + bin/second.py install_requires = - requests - importlib; python_version == "2.6" + requests + importlib; python_version == "2.6" [options.package_data] * = *.txt, *.rst @@ -2028,8 +2028,8 @@ Metadata and options are set in the config sections of the same name. [metadata] keywords = - one - two + one + two * In some cases, complex values can be provided in dedicated subsections for clarity. -- cgit v1.2.1 From 608988196d608f913398fc8853cfb797d2a1b63d Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 1 Sep 2020 19:14:22 -0400 Subject: Support 'bpo-' prefix on Python bugs --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/conf.py b/docs/conf.py index b92b50cc..20800e71 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -101,7 +101,7 @@ link_files = { url='http://bugs.jython.org/issue{jython}', ), dict( - pattern=r'Python #(?P\d+)', + pattern=r'(Python #|bpo-)(?P\d+)', url='http://bugs.python.org/issue{python}', ), dict( -- cgit v1.2.1 From d2e529896bcde20559da3fa2c01e825d218fdb18 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 1 Sep 2020 21:46:51 -0400 Subject: Add links for distutils --- docs/conf.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/conf.py b/docs/conf.py index 20800e71..12520586 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -128,6 +128,10 @@ link_files = { pattern=r'setuptools_svn #(?P\d+)', url='{GH}/jaraco/setuptools_svn/issues/{setuptools_svn}', ), + dict( + pattern=r'pypa/distutils#(?P\d+)', + url='{GH}/pypa/distutils/issues/{distutils}', + ), dict( pattern=r'^(?m)((?Pv?\d+(\.\d+){1,2}))\n[-=]+\n', with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n', -- cgit v1.2.1