Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also 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: jaraco/keyring
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v24.0.0
Choose a base ref
...
head repository: jaraco/keyring
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v24.0.1
Choose a head ref
  • 8 commits
  • 9 files changed
  • 1 contributor

Commits on Jun 21, 2023

  1. Adopt towncrier for managing changelog. Fixes jaraco/skeleton#83.

    Renamed CHANGES.rst to NEWS.rst to align with towncrier defaults.
    jaraco committed Jun 21, 2023
    Copy the full SHA
    74b0d39 View commit details
  2. Merge https://github.com/jaraco/skeleton

    # Conflicts:
    #	CHANGES.rst
    jaraco committed Jun 21, 2023
    Copy the full SHA
    898bcba View commit details
  3. Copy the full SHA
    0f053b8 View commit details
  4. Copy the full SHA
    e9bb4bc View commit details
  5. Copy the full SHA
    f1c8347 View commit details
  6. Remove Dockerfile for Windows. I haven't been able to use Docker with…

    … a windows guest since Apple Silicon.
    jaraco committed Jun 21, 2023
    Copy the full SHA
    3700711 View commit details
  7. Fixed EncodingWarnings.

    jaraco committed Jun 21, 2023
    Copy the full SHA
    a290f6a View commit details

Commits on Jun 22, 2023

  1. Rendered changelog.

    jaraco committed Jun 22, 2023
    2
    Copy the full SHA
    1d66ac2 View commit details
Showing with 204 additions and 212 deletions.
  1. +0 −4 .travis-macos
  2. +0 −9 Dockerfile
  3. +190 −181 CHANGES.rst → NEWS.rst
  4. +1 −1 docs/conf.py
  5. +1 −1 docs/history.rst
  6. +0 −15 docs/troubleshooting config.md
  7. +1 −1 keyring/core.py
  8. +2 −0 towncrier.toml
  9. +9 −0 tox.ini
4 changes: 0 additions & 4 deletions .travis-macos

This file was deleted.

9 changes: 0 additions & 9 deletions Dockerfile

This file was deleted.

371 changes: 190 additions & 181 deletions CHANGES.rst → NEWS.rst

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
# Link dates and other references in the changelog
extensions += ['rst.linker']
link_files = {
'../CHANGES.rst': dict(
'../NEWS.rst': dict(
using=dict(GH='https://github.com'),
replace=[
dict(
2 changes: 1 addition & 1 deletion docs/history.rst
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@
History
*******

.. include:: ../CHANGES (links).rst
.. include:: ../NEWS (links).rst
15 changes: 0 additions & 15 deletions docs/troubleshooting config.md

This file was deleted.

2 changes: 1 addition & 1 deletion keyring/core.py
Original file line number Diff line number Diff line change
@@ -155,7 +155,7 @@ def load_config() -> typing.Optional[backend.KeyringBackend]:

config = configparser.RawConfigParser()
try:
config.read(_config_path())
config.read(_config_path(), encoding='utf-8')
except FileNotFoundError:
return None
_load_keyring_path(config)
2 changes: 2 additions & 0 deletions towncrier.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[tool.towncrier]
title_format = "{version}"
9 changes: 9 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -25,6 +25,15 @@ commands =
python -m sphinx -W --keep-going . {toxinidir}/build/html
python -m sphinxlint

[testenv:finalize]
skip_install = True
deps =
towncrier
jaraco.develop
passenv = *
commands =
python -m jaraco.develop.towncrier build --yes

[testenv:release]
skip_install = True
deps =