Skip to content

Commit

Permalink
Merge pull request #316 from kianmeng/fix-typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
bennuttall committed May 22, 2022
2 parents 031672f + 4d7de8a commit 5c3230a
Show file tree
Hide file tree
Showing 19 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion docs/add.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Usage

This utility is intended to permit administrators to tweak the content of the
database to correct issues that arise from either incorrect scraping of the
PyPI history, inadvertant mistakes made with :doc:`remove`, or other
PyPI history, inadvertent mistakes made with :doc:`remove`, or other
inconsistencies found in the database.

The utility can be run in a batch mode with :option:`--yes` but still requires
Expand Down
2 changes: 1 addition & 1 deletion docs/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ protocol follows a strict request-reply sequence which is illustrated below:
* *mem_total* is the total size (in bytes) of the RAM on the build slave.

* *mem_free* is the number of bytes of RAM currently available (not
necessarily unused, but potentially useable by builds).
necessarily unused, but potentially usable by builds).

* *load_avg* is the one minute load average.

Expand Down
2 changes: 1 addition & 1 deletion docs/logger.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pipe all logs to a given script which can be used directly with

A typical configuration under a Debian-like operating system might use the
Apache `CustomLog`_ directive as follows, within the Apache virtual host
reponsible for serving files to ``pip`` clients:
responsible for serving files to ``pip`` clients:

.. code-block:: apacheconf
Expand Down
2 changes: 1 addition & 1 deletion docs/master.rst
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ specified in :file:`/etc/piwheels.conf`.

The only thing to be aware of, particularly if you are deploying on a Pi, is
that the calculation of the build queue is quite a big query. Assuming you are
targetting all packages on PyPI (as the production piwheels instance does), you
targeting all packages on PyPI (as the production piwheels instance does), you
should never consider running the combined database+master on a machine (or VM)
with less than 4 cores and 4GB of RAM, preferably more. If deploying a combined
master+database on a Pi, use a Pi 4 with 8GB of RAM.
Expand Down
2 changes: 1 addition & 1 deletion piwheels/importer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def main(args=None):
"""
This is the main function for the :program:`piw-import` script. It uses
some bits of the :program:`piw-slave` script to deconstruct the filenames
passed to it in order to build all the requried information that
passed to it in order to build all the required information that
:class:`~.mr_chase.MrChase` needs.
"""
sys.excepthook = terminal.error_handler
Expand Down
2 changes: 1 addition & 1 deletion piwheels/initdb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def main(args=None):
conn = get_connection(config.dsn)
logging.info("Checking username and superuser status")
detect_users(conn, config.user)
logging.info("Adminstration and master users verified")
logging.info("Administration and master users verified")
logging.info("Detecting database version")
db_version = detect_version(conn)
if db_version is None:
Expand Down
2 changes: 1 addition & 1 deletion piwheels/initdb/sql/create_piwheels.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@ AS $sql$
-- This guards against including insanely huge durations as
-- happens when a builder starts without NTP time sync and
-- records a start time of 1970-01-01 and a completion time
-- sometime this millenium...
-- sometime this millennium...
WHEN duration < INTERVAL '1 week' THEN duration
ELSE INTERVAL '0'
END), INTERVAL '0') AS builds_time
Expand Down
2 changes: 1 addition & 1 deletion piwheels/initdb/sql/update_piwheels_0.12_to_0.13.sql
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ CREATE VIEW statistics AS
-- This guards against including insanely huge durations as
-- happens when a builder starts without NTP time sync and
-- records a start time of 1970-01-01 and a completion time
-- sometime this millenium...
-- sometime this millennium...
WHEN duration < INTERVAL '1 week' THEN duration
ELSE INTERVAL '0'
END), INTERVAL '0') AS builds_time
Expand Down
2 changes: 1 addition & 1 deletion piwheels/initdb/sql/update_piwheels_0.13_to_0.14.sql
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ CREATE VIEW statistics AS
-- This guards against including insanely huge durations as
-- happens when a builder starts without NTP time sync and
-- records a start time of 1970-01-01 and a completion time
-- sometime this millenium...
-- sometime this millennium...
WHEN duration < INTERVAL '1 week' THEN duration
ELSE INTERVAL '0'
END), INTERVAL '0') AS builds_time
Expand Down
2 changes: 1 addition & 1 deletion piwheels/initdb/sql/update_piwheels_0.14_to_0.15.sql
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ AS $sql$
-- This guards against including insanely huge durations as
-- happens when a builder starts without NTP time sync and
-- records a start time of 1970-01-01 and a completion time
-- sometime this millenium...
-- sometime this millennium...
WHEN duration < INTERVAL '1 week' THEN duration
ELSE INTERVAL '0'
END), INTERVAL '0') AS builds_time
Expand Down
2 changes: 1 addition & 1 deletion piwheels/initdb/sql/update_piwheels_0.16_to_0.17.sql
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ AS $sql$
-- This guards against including insanely huge durations as
-- happens when a builder starts without NTP time sync and
-- records a start time of 1970-01-01 and a completion time
-- sometime this millenium...
-- sometime this millennium...
WHEN duration < INTERVAL '1 week' THEN duration
ELSE INTERVAL '0'
END), INTERVAL '0') AS builds_time
Expand Down
2 changes: 1 addition & 1 deletion piwheels/master/slave_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def handle_control(self, queue):
This class understands a couple of extra control messages unique to it,
specifically "KILL" to tell a build slave to terminate, "SKIP" to tell
a build slave to terminate its current build immmediately, and "HELLO"
a build slave to terminate its current build immediately, and "HELLO"
to cause all "HELLO" messages from build slaves to be replayed (for the
benefit of a newly attached monitor process).
"""
Expand Down
4 changes: 2 additions & 2 deletions piwheels/master/templates/faq.pt
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ extra-index-url=https://www.piwheels.org/simple</pre>
href="https://www.mythic-beasts.com/order/rpi">Mythic Beasts</a>.
The web pages and wheel files are served from a single Raspberry Pi 4,
we use a separate VM to host the database, and use several other
Raspberry Pis accross different OS versions to build wheels.</p>
Raspberry Pis across different OS versions to build wheels.</p>

<p>The original build run was completed by a total of 20 Raspberry
Pis, and now a smaller cluster remains active, continuing to build
Expand Down Expand Up @@ -369,7 +369,7 @@ extra-index-url=https://www.piwheels.org/simple</pre>
Raspberry Pi platform, there is no harm in uploading Arm wheels to
PyPI, and this will speed up the installation for users who do not
have pip configured to use piwheels. However, it is not possible to
upload two indentical wheel files with <code>armv6l</code> and
upload two identical wheel files with <code>armv6l</code> and
<code>armv7l</code> platform tags, so the second one will be rejected
by PyPI.</p>

Expand Down
2 changes: 1 addition & 1 deletion piwheels/master/templates/json.pt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ for version, info in package['releases'].items():

<p>Note that we intend to maintain the API structure, and to only add
fields, not remove or change fields. In the unlikely event of
compatability changes in future.</p>
compatibility changes in future.</p>

<p>Also note that packages and versions can be deleted, and can be
recreated, so it's inadvisable to expect such data not to change.
Expand Down
2 changes: 1 addition & 1 deletion piwheels/master/the_oracle.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def do_delbuild(self, package, version):
def do_pkgfiles(self, package):
"""
Handler for "PKGFILES" message, sent by :class:`DbClient` to request
details of all wheels assocated with *package*.
details of all wheels associated with *package*.
"""
return self.db.get_package_files(package)

Expand Down
4 changes: 2 additions & 2 deletions piwheels/slave/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def __call__(self, args=None):
# transfers occasionally needing a retry). Hence all the apparently silly
# asserts littering the functions below.

# This is in stark constrast to the master which is expected to stay up and
# This is in stark contrast to the master which is expected to stay up and
# carry on running even if a build slave goes bat-shit crazy and starts
# sending nonsense (in which case it should calmly ignore it and/or attempt
# to kill said slave with a "BYE" message).
Expand Down Expand Up @@ -338,7 +338,7 @@ def do_send(self, filename):
def do_done(self):
"""
The master can send "DONE" at any point during a built to terminate it
prematurely. Alternately, this is also the standard reponse after a
prematurely. Alternately, this is also the standard response after a
successful build has finished and all files have been sent (and
successfully verified).
Expand Down
2 changes: 1 addition & 1 deletion piwheels/states.py
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ class TransferState:
location.
The state is intimately tied to the file transfer protocol and includes
methods to write a recevied :meth:`chunk`, and to determine the next chunk
methods to write a received :meth:`chunk`, and to determine the next chunk
to :meth:`fetch`, as well as a property to determine when the transfer is
:attr:`done`.
Expand Down
4 changes: 2 additions & 2 deletions piwheels/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@ def recv_msg(self, flags=0):
"""
Receive a CBOR-encoded message, returning a tuple of the unicode
message string and its associated data. This is the primary method used
in piwheels for receving information into a task.
in piwheels for receiving information into a task.
The message, and its associated data, will be validated agains the
The message, and its associated data, will be validated against the
:attr:`protocol` associated with the socket on construction.
"""
msg, data = self._load_msg(self._socket.recv(flags))
Expand Down
2 changes: 1 addition & 1 deletion piwheels/widgets/event_loop.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
try:
from urwid import EventLoop
except ImportError:
# Use a compatbile EventLoop base class with urwid <2.x
# Use a compatible EventLoop base class with urwid <2.x
class EventLoop:
def alarm(self, seconds, callback):
raise NotImplementedError()
Expand Down

0 comments on commit 5c3230a

Please sign in to comment.