Skip to content

Commit

Permalink
docker & ruff: bumping python version
Browse files Browse the repository at this point in the history
  • Loading branch information
DonHaul committed Oct 10, 2024
1 parent c046c9c commit b1ffd41
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install poppler-utils

- name: Set up Python 3.8
uses: actions/setup-python@v2
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.11

- name: Install python dependencies
run: |
Expand All @@ -52,7 +52,7 @@ jobs:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Pre-commit check
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8
FROM python:3.11-slim-buster
RUN apt update && apt install poppler-utils -y
COPY setup.py setup.cfg README.rst ./
COPY refextract refextract/
Expand Down
3 changes: 2 additions & 1 deletion refextract/references/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ def extract_references_from_file(path,
extracted_texkeys_urls = extract_texkeys_and_urls_from_pdf(path)
if len(extracted_texkeys_urls) == len(parsed_refs):
parsed_refs_updated = []
for ref, ref_texkey_urls in zip(parsed_refs, extracted_texkeys_urls):
for ref, ref_texkey_urls in zip(parsed_refs, extracted_texkeys_urls,
strict=False):
update_reference_with_urls(ref, ref_texkey_urls.get('urls', []))
if ref.get('url'):
ref['url'] = dedupe_list(ref['url'])
Expand Down
2 changes: 1 addition & 1 deletion ruff.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
target-version = "py38"
target-version = "py311"
[lint.flake8-tidy-imports]
ban-relative-imports = "all"

Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
tests_require = [
'flake8-future-import~=0.0,>=0.4.4',
'flake8~=3.0,>=3.5.0',
'pytest-cov~=2.0,>=2.10',
'pytest~=4.0,>=4.6',
'pytest-cov~=5.0',
'pytest~=8.0.0',
'responses~=0.0,>=0.8.1',
'mock>=4.0.3'
'mock~=5.1.0'
]

extras_require = {
Expand Down
4 changes: 2 additions & 2 deletions tests/test_kbs.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_get_kbs_caches_journal_dict():
# the cache is reused, so identity of the cache elements doesn't change
assert all(
cached_first is cached_second for (cached_first, cached_second)
in zip(first_cache["journals"], second_cache["journals"])
in zip(first_cache["journals"], second_cache["journals"], strict=False)
)


Expand All @@ -55,7 +55,7 @@ def test_get_kbs_invalidates_cache_if_input_changes():
# the cache is invalidated, so identity of the cache elements changes
assert all(
cached_first is not cached_second for (cached_first, cached_second)
in zip(first_cache["journals"], second_cache["journals"])
in zip(first_cache["journals"], second_cache["journals"], strict=False)
)
assert len(second_cache["journals"]) == 3
assert second_cache["journals"][-1] == ["JOURNAL OF TESTING", "J TEST"]

0 comments on commit b1ffd41

Please sign in to comment.