Skip to content

Fix Dockerfile and requirements#130

Open
soelderer wants to merge 3 commits into
nlmatics:mainfrom
soelderer:fixmergeconflict
Open

Fix Dockerfile and requirements#130
soelderer wants to merge 3 commits into
nlmatics:mainfrom
soelderer:fixmergeconflict

Conversation

@soelderer
Copy link
Copy Markdown

@soelderer soelderer commented Mar 19, 2026

Description of the change

Just a quick fix for some issues:

  • Dockerfile contained conflict markers from a merge conflict
  • requirements.txt contained an absolute path for whl
  • requirements.txt for nlm_utils and the associated hash were stale (updated version to 0.1.4)

Type of change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Related issues

Fixes #121 and #122

Checklists

Development

  • Lint rules pass locally
  • The code changed/added as part of this pull request has been covered with tests
  • All tests related to the changed code pass in development

Code review

  • This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
  • "Ready for review" label attached to the PR and reviewers mentioned in a comment
  • Changes have been reviewed by at least one other engineer
  • Issue from task tracker has a link to this pull request

there were merge conflict markers in the Dockerfile which corrupts it.
- switch nlm-utils from 0.1.3 to 0.1.4
- update aiohttp to 3.9.4 to satisfy dependency constraints
- replace absolute local wheel path with relative path for portability"
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.

Merge conflict pushed to main Branch

1 participant