Skip to content

Commit

Permalink
Merge spelling/space improvements (#3695, #3698, #3697, #3699)
Browse files Browse the repository at this point in the history
  • Loading branch information
abravalheri committed Nov 23, 2022
5 parents b9dfcb8 + 915a7c8 + 51e1447 + cdec8c2 + 71d9566 commit 9b7dc35
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 21 deletions.
6 changes: 3 additions & 3 deletions docs/build_meta.rst
Expand Up @@ -48,8 +48,8 @@ files, a ``pyproject.toml`` file and a ``setup.cfg`` file::
pyproject.toml
setup.cfg
meowpkg/
__init__.py
module.py
__init__.py
module.py

The ``pyproject.toml`` file specifies the build system (i.e. what is
being used to package your scripts and install from source). To use it with
Expand Down Expand Up @@ -161,7 +161,7 @@ requirements.
and :pypi:`setuptools-svn`), or by correctly setting up :ref:`MANIFEST.in
<manifest>`.

The generated ``.tar.gz`` and ``.whl`` files are compressed archives that
The generated ``.tar.gz`` and ``.whl`` files are compressed archives that
can be inspected as follows:
On POSIX systems, this can be done with ``tar -tf dist/*.tar.gz``
and ``unzip -l dist/*.whl``.
Expand Down
2 changes: 0 additions & 2 deletions docs/deprecated/distutils/commandref.rst
Expand Up @@ -101,5 +101,3 @@ anything except backslash or colon.
.. % \subsection{\protect\command{bdist}}
.. % \subsection{\protect\command{bdist\_dumb}}
.. % \subsection{\protect\command{bdist\_rpm}}
1 change: 0 additions & 1 deletion docs/deprecated/distutils/configfile.rst
Expand Up @@ -142,4 +142,3 @@ split across multiple lines for readability.

.. [#] This ideal probably won't be achieved until auto-configuration is fully
supported by the Distutils.
2 changes: 0 additions & 2 deletions docs/deprecated/distutils/extending.rst
Expand Up @@ -94,5 +94,3 @@ to add ``(command, filename)`` pairs to ``self.distribution.dist_files`` so that
:command:`upload` can upload it to PyPI. The *filename* in the pair contains no
path information, only the name of the file itself. In dry-run mode, pairs
should still be added to represent what would have been created.


2 changes: 1 addition & 1 deletion docs/deprecated/zip_safe.rst
Expand Up @@ -62,7 +62,7 @@ Currently, popular Python package installers (such as :pypi:`pip`) and package
indexes (such as PyPI_) consider that distribution packages are always
installed as a directory.
It is however still possible to load packages from zip files added to
:obj:`sys.path`, thanks to the :mod:`zipimport` module
:obj:`sys.path`, thanks to the :mod:`zipimport` module
and the :mod:`importlib` machinery provided by Python standard library.

When working with modules loaded from a zip file, it is important to keep in
Expand Down
6 changes: 3 additions & 3 deletions docs/userguide/development_mode.rst
Expand Up @@ -17,7 +17,7 @@ without requiring a new installation.

You can enter this "development mode" by performing an :doc:`editable installation
<pip:topics/local-project-installs>` inside of a :term:`virtual environment`,
using :doc:`pip's <pip:cli/pip_install>` ``-e/--editable`` flag, as shown bellow:
using :doc:`pip's <pip:cli/pip_install>` ``-e/--editable`` flag, as shown below:

.. code-block:: bash
Expand Down Expand Up @@ -69,7 +69,7 @@ Please have a look on the following section if you are looking for a different b
sudo apt install python3-venv
Alternatively, you can also try installing :pypi:`virtualenᴠ`.
Alternatively, you can also try installing :pypi:`virtualenv`.
More information is available on the Python Packaging User Guide on
:doc:`PyPUG:guides/installing-using-pip-and-virtual-environments`.

Expand All @@ -93,7 +93,7 @@ expectations:
Unfortunately these expectations are in conflict with each other.
To solve this problem ``setuptools`` allows developers to choose a more
*"strict"* mode for the editable installation. This can be done by passing
a special *configuration setting* via :pypi:`pip`, as indicated bellow:
a special *configuration setting* via :pypi:`pip`, as indicated below:

.. code-block:: bash
Expand Down
2 changes: 1 addition & 1 deletion docs/userguide/entry_point.rst
Expand Up @@ -89,7 +89,7 @@ configuration:
.. tab:: setup.py

.. code-block:: python
from setuptools import setup
setup(
Expand Down
2 changes: 1 addition & 1 deletion docs/userguide/quickstart.rst
Expand Up @@ -165,7 +165,7 @@ to specify to properly package your project.
:doc:`setup.cfg <declarative_config>`, and keep the ``setup.py`` minimal
with only the dynamic parts (or even omit it completely if applicable).

See `Why you shouldn't invoke setup.py directly`_ for more background.
See `Why you shouldn't invoke setup.py directly`_ for more background.

.. _Why you shouldn't invoke setup.py directly: https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html

Expand Down
9 changes: 4 additions & 5 deletions launcher.c
Expand Up @@ -180,7 +180,7 @@ void pass_control_to_child(DWORD control_type) {
}

BOOL control_handler(DWORD control_type) {
/*
/*
* distribute-issue207
* control event handler callback function
*/
Expand All @@ -204,12 +204,12 @@ int create_and_wait_for_subprocess(char* command) {
ZeroMemory(&p_info, sizeof(p_info));
ZeroMemory(&s_info, sizeof(s_info));
s_info.cb = sizeof(STARTUPINFO);
// set-up control handler callback funciotn
// set-up control handler callback function
SetConsoleCtrlHandler((PHANDLER_ROUTINE) control_handler, TRUE);
if (!CreateProcessA(NULL, commandline, NULL, NULL, TRUE, 0, NULL, NULL, &s_info, &p_info)) {
fprintf(stderr, "failed to create process.\n");
return 0;
}
}
child_pid = p_info.dwProcessId;
// wait for Python to exit
WaitForSingleObject(p_info.hProcess, INFINITE);
Expand All @@ -229,7 +229,7 @@ char* join_executable_and_args(char *executable, char **args, int argc)
*/
int len,counter;
char* cmdline;

len=strlen(executable)+2;
for (counter=1; counter<argc; counter++) {
len+=strlen(args[counter])+1;
Expand Down Expand Up @@ -333,4 +333,3 @@ int WINAPI WinMain(HINSTANCE hI, HINSTANCE hP, LPSTR lpCmd, int nShow) {
int main(int argc, char** argv) {
return run(argc, argv, GUI);
}

4 changes: 2 additions & 2 deletions setuptools/tests/test_build_meta.py
Expand Up @@ -44,7 +44,7 @@ def __init__(self, *args, **kwargs):
self.pool = futures.ProcessPoolExecutor(max_workers=1)

def __getattr__(self, name):
"""Handles aribrary function invocations on the build backend."""
"""Handles arbitrary function invocations on the build backend."""

def method(*args, **kw):
root = os.path.abspath(self.cwd)
Expand Down Expand Up @@ -79,7 +79,7 @@ def __init__(self, *args, **kwargs):
self.backend_obj) = self.backend_name.partition(':')

def __call__(self, name, *args, **kw):
"""Handles aribrary function invocations on the build backend."""
"""Handles arbitrary function invocations on the build backend."""
os.chdir(self.cwd)
os.environ.update(self.env)
mod = importlib.import_module(self.backend_name)
Expand Down

0 comments on commit 9b7dc35

Please sign in to comment.