Skip to content

Conversation

@aaxelb
Copy link
Contributor

@aaxelb aaxelb commented Mar 26, 2025

  • use poetry to install/manage dependencies
    • remove requirements.txt, dev-requirements.txt, constraints.txt
    • add dependencies to pyproject.toml
    • add poetry.lock
    • update Dockerfile and docker-compose.yml to use poetry
  • assorted cleanup
    • update github action to use python 3.13
    • remove (now unused) elasticsearch5 code (including sharev2_elastic5 index strategy)
    • remove (now unused) trove_indexcard_flats index strategy

@aaxelb aaxelb changed the base branch from develop to feature/share-cleanupgrade-2025 March 26, 2025 13:01
@aaxelb aaxelb force-pushed the mob/2025-03-26 branch 2 times, most recently from a3de9f3 to 07840eb Compare March 26, 2025 19:57
@coveralls
Copy link

coveralls commented Mar 26, 2025

Coverage Status

coverage: 77.849% (-1.3%) from 79.141%
when pulling e698c8d on aaxelb:mob/2025-03-26
into 859a77b on CenterForOpenScience:feature/share-cleanupgrade-2025.

@aaxelb aaxelb force-pushed the mob/2025-03-26 branch 2 times, most recently from ed884d7 to 0c7a8f0 Compare April 9, 2025 17:48
@aaxelb aaxelb changed the title [wip][gizmob] poetry... [ENG-7411] poetry and assorted cleanup Apr 10, 2025
@aaxelb aaxelb marked this pull request as ready for review April 10, 2025 19:17
@aaxelb aaxelb requested a review from felliott April 10, 2025 19:21
Copy link
Member

@felliott felliott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! I had a couple of small questions, but neither is a dealbreaker.

Cheers,
@felliott

FROM app AS dev

RUN pip install --no-cache-dir -c /code/constraints.txt -r /code/dev-requirements.txt
RUN $POETRY_HOME/bin/poetry install --compile --only dev
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Docker build had a few nitpicks, but these aren't dealbreakers:

 3 warnings found (use docker --debug to expand):                                                                                                                                                           
 - FromAsCasing: 'as' and 'FROM' keywords' casing do not match (line 1)
 - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 60)
 - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 61)


- name: set up python${{ matrix.python-version }}
- name: Install poetry
run: pipx install poetry
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be pinned to the same version as the Dockerfile (2.1.1)? I don't have a strong opinion. It might be worth to leave unpinned as a canary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also no strong opinion -- leaving it unpinned as canary seems a fine idea

@aaxelb aaxelb merged commit 8bbaada into CenterForOpenScience:feature/share-cleanupgrade-2025 Apr 18, 2025
1 of 2 checks passed
@aaxelb aaxelb deleted the mob/2025-03-26 branch April 18, 2025 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants