Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: procrastinate-org/procrastinate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6730de3604b8abd12568a44f608c8f53b504a892
Choose a base ref
..
head repository: procrastinate-org/procrastinate
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d810a6f35b99c5dc8f3c7a4098e35e9d8d5a89fd
Choose a head ref
Showing with 24 additions and 18 deletions.
  1. +10 −10 CONTRIBUTING.rst
  2. +4 −4 docs/discussions.rst
  3. +4 −1 docs/spelling_wordlist.txt
  4. +1 −1 procrastinate/aiopg_connector.py
  5. +1 −1 procrastinate/testing.py
  6. +4 −1 tox.ini
20 changes: 10 additions & 10 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ TL;DR
$ # Export libpq env vars for PG connection
$ export PGDATABASE=procrastinate PGHOST=localhost PGUSER=postgres
$ # Launch Postgres within Docker
$ # Launch PostgreSQL within Docker
$ compose up -d
$ # Explore tox entrypoints
@@ -42,7 +42,7 @@ Environment variables

The `export` command below will be necessary whenever you want to interact with
the database (using the project locally, launching tests, ...).
These are standard libpq environment variables, and the values used below correspond
These are standard ``libpq`` environment variables, and the values used below correspond
to the docker setup. Feel free to adjust them as necessary.

.. code-block:: console
@@ -53,16 +53,16 @@ Create your development database
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

The development database can be launched using docker with a single command.
The postgreSQL database we used is a fresh standard out-of-the-box database
The PostgreSQL database we used is a fresh standard out-of-the-box database
on the latest stable version.

.. code-block:: console
$ docker-compose up -d
If you want to try out the project locally, it's useful to have postgresql-client
installed. It will give you both a postgres console (``psql``) and specialized
commands like `createdb` we use below.
If you want to try out the project locally, it's useful to have ``postgresql-client``
installed. It will give you both a PostgreSQL console (``psql``) and specialized
commands like ``createdb`` we use below.

.. code-block:: console
@@ -81,8 +81,8 @@ for your user:
$ pip install --user tox
In order for this to work, you'll need to make sure your python user install binary
directory is included in your shell's `PATH`. One way of doing that is to add
a line in your `~/.profile` (or `~/.zprofile` for zsh). The following command
directory is included in your shell's ``PATH``. One way of doing that is to add
a line in your ``~/.profile`` (or ``~/.zprofile`` for ``zsh``). The following command
will output the line to write in that file:

.. code-block:: console
@@ -172,8 +172,8 @@ hook which makes sure that all your commits are created clean:
EOF
chmod +x .git/hooks/pre-commit
If tox is installed inside your virtualenv, you may want to activate the virtualenv
in ``.git/hooks/pre-commit``:
If ``tox`` is installed inside your ``virtualenv``, you may want to activate the
``virtualenv`` in ``.git/hooks/pre-commit``:

.. code-block:: bash
8 changes: 4 additions & 4 deletions docs/discussions.rst
Original file line number Diff line number Diff line change
@@ -208,10 +208,10 @@ and an asynchronous code:
we decided to do.

We've even cheated a bit: instead of implementing our synchronous wrappers manually,
we've been using a trick that autogenerates a synchronous API based on our asynchronous
API. This way, we have less code to unit-test, and we can guarantee that the 2 APIs
will stay synchronized in the future no matter what. Want to know more about this?
Here are a few resources:
we've been using a trick that automatically generates a synchronous API based on our
asynchronous API. This way, we have less code to unit-test, and we can guarantee that
the 2 APIs will stay synchronized in the future no matter what. Want to know more about
this? Here are a few resources:

- How we generate our sync API:
https://github.com/peopledoc/procrastinate/blob/master/procrastinate/utils.py
5 changes: 4 additions & 1 deletion docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
admin
app
async
asynchronicity
backend
backoff
builtin
codebase
codebases
cron
crons
Dramatiq
enqueued
formatters
linting
middleware
Postgres
quickstart
reimplement
sync
2 changes: 1 addition & 1 deletion procrastinate/aiopg_connector.py
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ def interrupt_wait(connection: aiopg.Connection):
class PostgresJobStore(store.BaseJobStore):
"""
Uses ``aiopg`` to establish an asynchronous
connection to a Postgres database.
connection to a PostgreSQL database.
"""

def __init__(self, *, socket_timeout: float = store.SOCKET_TIMEOUT, **kwargs: Any):
2 changes: 1 addition & 1 deletion procrastinate/testing.py
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ def __init__(self):
"""
Attributes
----------
jobs : Dict[int, Dict]
jobs : ``Dict[int, Dict]``
Mapping of ``{<job id>: <Job database row as a dictionary>}``
"""
self.reset()
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -54,4 +54,7 @@ commands =
sphinx-build -EW -b spelling docs docs/_build/html {posargs}
doc8 docs
# wordlist should be sorted to avoid duplicates
sort -c docs/spelling_wordlist.txt
# If this line breaks, fix with:
# sort -bdfi docs/spelling_wordlist.txt -o docs/spelling_wordlist.txt
sort -cbdfi docs/spelling_wordlist.txt