Skip to content

Commit

Permalink
docs: Use only major version in python.org URL
Browse files Browse the repository at this point in the history
  • Loading branch information
jpmckinney committed Jan 27, 2023
1 parent ca44027 commit 61f8ec8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Changed
~~~~~~~

- The collision behavior is changed to always warn.
- Remove the ``collision_behavior`` argument. Use a `warning filter <https://docs.python.org/3.8/library/warnings.html>`__ instead.
- Remove the ``collision_behavior`` argument. Use a `warning filter <https://docs.python.org/3/library/warnings.html>`__ instead.
- Add ``path`` and ``id`` properties to ``DuplicateIdValueWarning`` to store the ``path`` at which, and the ``id`` on which, the collision occurred.

0.5.10.post2 (2019-11-22)
Expand Down Expand Up @@ -142,7 +142,7 @@ Changed
- Warn if multiple objects in an array have the same ``id`` value.
- Add a ``collision_behavior`` argument to ``merge``, ``merge_versioned``, ``add_release_to_compiled_release`` and ``add_release_to_versioned_release``, which can be set to:

- ``ocdsmerge.WARN``: issue a ``DuplicateIdValueWarning`` `warning <https://docs.python.org/3.8/library/warnings.html>`__ (default)
- ``ocdsmerge.WARN``: issue a ``DuplicateIdValueWarning`` `warning <https://docs.python.org/3/library/warnings.html>`__ (default)
- ``ocdsmerge.RAISE``: raise a ``DuplicateIdValueError`` exception
- ``ocdsmerge.IGNORE``: silently ignore the collision

Expand Down
2 changes: 1 addition & 1 deletion docs/handle-bad-data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The merge routine merges multiple individual releases into either a compiled rel

However, if objects that correspond to different things re-use ``id`` values, then only the last object is retained in the merged release, by default. (To be clear, such data has structural errors.) For example, if a publisher creates a release for each award notice in a procurement procedure, and restarts the numbering of award objects in each release from '1', then the later releases will overwrite the award objects of the earlier releases.

Similarly, if, in a single release, objects in the same array share an ``id`` value, then only the last object is retained. If so, this package issues a :code:`DuplicateIdValueWarning` warning. You can turn the warning into an exception or ignore the warning using a `warning filter <https://docs.python.org/3.8/library/warnings.html>`__. For example:
Similarly, if, in a single release, objects in the same array share an ``id`` value, then only the last object is retained. If so, this package issues a :code:`DuplicateIdValueWarning` warning. You can turn the warning into an exception or ignore the warning using a `warning filter <https://docs.python.org/3/library/warnings.html>`__. For example:

.. code-block:: python
Expand Down

0 comments on commit 61f8ec8

Please sign in to comment.