Skip to content

Commit 2b89830

Browse files
committed
project: update dependencies
* Bumps dependencies. * Allows python versions 3.9 - 3.12 Co-Authored-by: Peter Weber <[email protected]>
1 parent 24135fb commit 2b89830

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+3964
-3451
lines changed

.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ known_first_party = rero_ils
2222
multi_line_output = 2
2323
default_section = THIRDPARTY
2424
skip = .eggs
25+
# Needed for isort since version 4.3.10
26+
reverse_relative = true
2527

2628
# RST files (used by sphinx)
2729
[*.rst]

.github/workflows/continuous-integration-test.yml

+3-27
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
python-version: [3.7, 3.8, 3.9]
37+
python-version: ["3.9", "3.10", "3.11", "3.12"]
3838
requirements-level: [min, pypi]
3939
cache-service: [redis]
4040
# services: [release, devel]
@@ -62,24 +62,21 @@ jobs:
6262
uses: actions/checkout@v2
6363

6464
- name: Set up Python ${{ matrix.python-version }}
65-
uses: actions/setup-python@v2
65+
uses: actions/setup-python@v5
6666
with:
6767
python-version: ${{ matrix.python-version }}
6868

6969
- name: Install Poetry
7070
uses: snok/install-poetry@v1
71-
with:
72-
version: 1.2.2
7371

7472
- name: Install dependencies
7573
run: |
7674
docker --version
77-
docker-compose --version
7875
poetry install
7976
8077
- name: Run tests
8178
run: |
82-
poetry run ./run-tests.sh
79+
poetry run ./run-tests.sh docker-services
8380
continue-on-error: false
8481

8582
- name: Upload Coverage ${{ matrix.python-version }}
@@ -93,24 +90,3 @@ jobs:
9390
pip install --upgrade coveralls
9491
coveralls
9592
96-
# coveralls:
97-
# needs: [python-tests]
98-
# runs-on: ubuntu-latest
99-
# steps:
100-
# - name: Cancel Previous Runs
101-
# uses: styfle/[email protected]
102-
# with:
103-
# access_token: ${{ github.token }}
104-
#
105-
# - name: Set up Python 3.6
106-
# uses: actions/setup-python@v2
107-
# with:
108-
# python-version: 3.6
109-
#
110-
# - name: Finished
111-
# env:
112-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
113-
# COVERALLS_PARALLEL_FINISHED: true
114-
# run: |
115-
# pip install --upgrade coveralls
116-
# coveralls --finish

docs/conf.py

+58-51
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,41 @@
1414

1515
# Do not warn on external images.
1616
import os
17+
import sys
1718

18-
suppress_warnings = ['image.nonlocal_uri']
19+
sys.path.insert(0, os.path.abspath(".."))
20+
21+
suppress_warnings = ["image.nonlocal_uri"]
1922

2023
# Add any Sphinx extension module names here, as strings. They can be
2124
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
2225
# ones.
2326
extensions = [
24-
'sphinx.ext.autodoc',
25-
'sphinx.ext.coverage',
26-
'sphinx.ext.doctest',
27-
'sphinx.ext.intersphinx',
28-
'sphinx.ext.viewcode',
27+
"sphinx.ext.autodoc",
28+
"sphinx.ext.coverage",
29+
"sphinx.ext.doctest",
30+
"sphinx.ext.intersphinx",
31+
"sphinx.ext.viewcode",
2932
]
3033

3134
# Add any paths that contain templates here, relative to this directory.
32-
templates_path = ['_templates']
35+
templates_path = ["_templates"]
3336

3437
# The suffix(es) of source filenames.
3538
# You can specify multiple suffix as a list of string:
3639
# source_suffix = ['.rst', '.md']
37-
source_suffix = '.rst'
40+
source_suffix = ".rst"
3841

3942
# The encoding of source files.
4043
# source_encoding = 'utf-8-sig'
4144

4245
# The master toctree document.
43-
master_doc = 'index'
46+
master_doc = "index"
4447

4548
# General information about the project.
46-
project = u'Invenio-SIP2'
47-
copyright = u'2019, UCLouvain'
48-
author = u'UCLouvain'
49+
project = "Invenio-SIP2"
50+
copyright = "2019, UCLouvain"
51+
author = "UCLouvain"
4952

5053
# The version info for the project you're documenting, acts as replacement for
5154
# |version| and |release|, also used in various other places throughout the
@@ -55,11 +58,11 @@
5558

5659
# Get the version string. Cannot be done with import!
5760
module_data = {}
58-
with open(os.path.join(os.path.dirname(__file__), '..',
59-
'invenio_sip2', 'version.py'),
60-
'rt') as file:
61+
with open(
62+
os.path.join(os.path.dirname(__file__), "..", "invenio_sip2", "version.py"), "rt"
63+
) as file:
6164
exec(file.read(), module_data)
62-
version = module_data['__version__']
65+
version = module_data["__version__"]
6366
# The full version, including alpha/beta/rc tags.
6467
release = version
6568

@@ -68,7 +71,7 @@
6871
#
6972
# This is also used if you do content translation via gettext catalogs.
7073
# Usually you set "language" from the command line for these cases.
71-
language = 'en'
74+
language = "en"
7275

7376
# There are two options for replacing |today|: either, you set today to some
7477
# non-false value, then it is used:
@@ -96,7 +99,7 @@
9699
# show_authors = False
97100

98101
# The name of the Pygments (syntax highlighting) style to use.
99-
pygments_style = 'sphinx'
102+
pygments_style = "sphinx"
100103

101104
# A list of ignored prefixes for module index sorting.
102105
# modindex_common_prefix = []
@@ -109,20 +112,19 @@
109112

110113

111114
# -- Options for HTML output ----------------------------------------------
112-
html_theme = 'alabaster'
115+
html_theme = "alabaster"
113116

114117
html_theme_options = {
115-
'description': 'Library Selfcheck SIP2 module for invenio',
116-
'github_user': 'inveniosoftware-contrib',
117-
'github_repo': 'invenio-sip2',
118-
'github_button': False,
119-
'github_banner': True,
120-
'show_powered_by': False,
121-
'extra_nav_links': {
122-
'invenio-sip2@GitHub':
123-
'https://github.com/inveniosoftware-contrib/invenio-sip2',
124-
'invenio-sip2@PyPI': 'https://pypi.python.org/pypi/invenio-sip2/',
125-
}
118+
"description": "Library Selfcheck SIP2 module for invenio",
119+
"github_user": "inveniosoftware-contrib",
120+
"github_repo": "invenio-sip2",
121+
"github_button": False,
122+
"github_banner": True,
123+
"show_powered_by": False,
124+
"extra_nav_links": {
125+
"invenio-sip2@GitHub": "https://github.com/inveniosoftware-contrib/invenio-sip2",
126+
"invenio-sip2@PyPI": "https://pypi.python.org/pypi/invenio-sip2/",
127+
},
126128
}
127129

128130
# The theme to use for HTML and HTML Help pages. See the documentation for
@@ -172,12 +174,12 @@
172174

173175
# Custom sidebar templates, maps document names to template names.
174176
html_sidebars = {
175-
'**': [
176-
'about.html',
177-
'navigation.html',
178-
'relations.html',
179-
'searchbox.html',
180-
'donate.html',
177+
"**": [
178+
"about.html",
179+
"navigation.html",
180+
"relations.html",
181+
"searchbox.html",
182+
"donate.html",
181183
]
182184
}
183185

@@ -226,20 +228,17 @@
226228
# html_search_scorer = 'scorer.js'
227229

228230
# Output file base name for HTML help builder.
229-
htmlhelp_basename = 'invenio-sip2_namedoc'
231+
htmlhelp_basename = "invenio-sip2_namedoc"
230232

231233
# -- Options for LaTeX output ---------------------------------------------
232234

233235
latex_elements = {
234236
# The paper size ('letterpaper' or 'a4paper').
235237
# 'papersize': 'letterpaper',
236-
237238
# The font size ('10pt', '11pt' or '12pt').
238239
# 'pointsize': '10pt',
239-
240240
# Additional stuff for the LaTeX preamble.
241241
# 'preamble': '',
242-
243242
# Latex figure (float) alignment
244243
# 'figure_align': 'htbp',
245244
}
@@ -248,8 +247,13 @@
248247
# (source start file, target name, title,
249248
# author, documentclass [howto, manual, or own class]).
250249
latex_documents = [
251-
(master_doc, 'invenio-sip2.tex', u'invenio-sip2 Documentation',
252-
u'UCLouvain', 'manual'),
250+
(
251+
master_doc,
252+
"invenio-sip2.tex",
253+
"invenio-sip2 Documentation",
254+
"UCLouvain",
255+
"manual",
256+
),
253257
]
254258

255259
# The name of an image file (relative to this directory) to place at the top of
@@ -277,10 +281,7 @@
277281

278282
# One entry per manual page. List of tuples
279283
# (source start file, name, description, authors, manual section).
280-
man_pages = [
281-
(master_doc, 'invenio-sip2', u'invenio-sip2 Documentation',
282-
[author], 1)
283-
]
284+
man_pages = [(master_doc, "invenio-sip2", "invenio-sip2 Documentation", [author], 1)]
284285

285286
# If true, show URL addresses after external links.
286287
# man_show_urls = False
@@ -292,9 +293,15 @@
292293
# (source start file, target name, title, author,
293294
# dir menu entry, description, category)
294295
texinfo_documents = [
295-
(master_doc, 'invenio-sip2', u'Invenio-SIP2 Documentation',
296-
author, 'invenio-sip2', 'Library Selfcheck SIP2 module for invenio',
297-
'Miscellaneous'),
296+
(
297+
master_doc,
298+
"invenio-sip2",
299+
"Invenio-SIP2 Documentation",
300+
author,
301+
"invenio-sip2",
302+
"Library Selfcheck SIP2 module for invenio",
303+
"Miscellaneous",
304+
),
298305
]
299306

300307
# Documents to append as an appendix to all manuals.
@@ -312,10 +319,10 @@
312319

313320
# Example configuration for intersphinx: refer to the Python standard library.
314321
intersphinx_mapping = {
315-
'python': ('https://docs.python.org/', None),
322+
"python": ("https://docs.python.org/", None),
316323
# TODO: Configure external documentation references, eg:
317324
# 'Flask-Admin': ('https://flask-admin.readthedocs.io/en/latest/', None),
318325
}
319326

320327
# Autodoc configuraton.
321-
autoclass_content = 'both'
328+
autoclass_content = "both"

invenio_sip2/__init__.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,4 @@
2525

2626
datastore = LocalProxy(lambda: current_sip2.datastore)
2727

28-
__all__ = (
29-
'__version__',
30-
'current_datastore',
31-
'current_sip2',
32-
'InvenioSIP2'
33-
)
28+
__all__ = ("__version__", "current_datastore", "current_sip2", "InvenioSIP2")

invenio_sip2/actions/__init__.py

+18-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,24 @@
1717

1818
"""Invenio-SIP2 actions module."""
1919

20-
from invenio_sip2.actions.actions import AutomatedCirculationSystemStatus, \
21-
BlockPatron, Checkin, Checkout, EndPatronSession, FeePaid, Hold, \
22-
ItemInformation, ItemStatusUpdate, PatronEnable, PatronInformation, \
23-
PatronStatus, Renew, RenewAll, RequestResend, SelfCheckLogin
20+
from invenio_sip2.actions.actions import (
21+
AutomatedCirculationSystemStatus,
22+
BlockPatron,
23+
Checkin,
24+
Checkout,
25+
EndPatronSession,
26+
FeePaid,
27+
Hold,
28+
ItemInformation,
29+
ItemStatusUpdate,
30+
PatronEnable,
31+
PatronInformation,
32+
PatronStatus,
33+
Renew,
34+
RenewAll,
35+
RequestResend,
36+
SelfCheckLogin,
37+
)
2438

2539
__all__ = (
2640
AutomatedCirculationSystemStatus,

0 commit comments

Comments
 (0)