Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion medcat-demo-app/webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN pip install -U pip && if [ "$USE_CPU_TORCH" = "true" ]; then \
ARG REINSTALL_CORE_FROM_LOCAL=false
RUN if [ "$REINSTALL_CORE_FROM_LOCAL" = "true" ]; then \
echo "Reinstalling medcat based on relative path"; \
pip install -e "/webapp/medcat-v2[meta-cat,spacy]"; \
SETUPTOOLS_SCM_PRETEND_VERSION="2.4.0-dev0" pip install -e "/webapp/medcat-v2[meta-cat,spacy]"; \
fi

# Get the spacy model (for later copy)
Expand Down
2 changes: 1 addition & 1 deletion medcat-service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ COPY . /cat
ARG REINSTALL_CORE_FROM_LOCAL=false
RUN if [ "$REINSTALL_CORE_FROM_LOCAL" = "true" ]; then \
echo "Reinstalling medcat based on relative path"; \
pip install -e "./medcat-v2[meta-cat,spacy]"; \
SETUPTOOLS_SCM_PRETEND_VERSION="2.4.0-dev0" pip install -e "./medcat-v2[meta-cat,spacy]"; \
fi

# Now run the simple api
Expand Down
2 changes: 1 addition & 1 deletion medcat-service/Dockerfile_gpu
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ COPY . /cat
ARG REINSTALL_CORE_FROM_LOCAL=false
RUN if [ "$REINSTALL_CORE_FROM_LOCAL" = "true" ]; then \
echo "Reinstalling medcat based on relative path"; \
pip install -e "./medcat-v2[meta-cat,spacy]"; \
SETUPTOOLS_SCM_PRETEND_VERSION="2.4.0-dev0" pip install -e "./medcat-v2[meta-cat,spacy]"; \
fi

# Now run the simple api
Expand Down
12 changes: 0 additions & 12 deletions medcat-v2/.release/prepare_minor_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,6 @@ fi
# NOTE: will overwrite release branch if --force is specified
run_or_echo git checkout -B "$RELEASE_BRANCH"

# Update version in pyproject.toml
if [[ "$(uname)" == "Darwin" ]]; then
# macOS (BSD sed)
run_or_echo sed -i \'\' \'s/^version = \".*\"/version = \"\'$VERSION\'\"/\' pyproject.toml
else
# Linux (GNU sed)
run_or_echo sed -i \'s/^version = \".*\"/version = \"\'$VERSION\'\"/\' pyproject.toml
fi

run_or_echo git add pyproject.toml
run_or_echo git commit -m \"Bump version to $VERSION for release\"

# Create and push tag
run_or_echo git tag -a \"$VERSION_TAG\" -m \"Release v$VERSION\"
run_or_echo git push origin \"$RELEASE_BRANCH\"
Expand Down
14 changes: 0 additions & 14 deletions medcat-v2/.release/prepare_patch_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,20 +169,6 @@ for HASH in "${CHERRYPICK_HASHES[@]-}"; do
fi
done


# Update version in pyproject.toml
if [[ "$(uname)" == "Darwin" ]]; then
# macOS (BSD sed)
run_or_echo sed -i \'\' \'s/^version = \".*\"/version = \"\'$VERSION\'\"/\' pyproject.toml
else
# Linux (GNU sed)
run_or_echo sed -i \'s/^version = \".*\"/version = \"\'$VERSION\'\"/\' pyproject.toml
fi

# add and commit changes
run_or_echo git add pyproject.toml
run_or_echo git commit -m \"Bump version to $VERSION\" --allow-empty

# now do the tagging
# NOTE: can force since without the `--force` flag we would have checked
# for existing tag
Expand Down
19 changes: 16 additions & 3 deletions medcat-v2/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "medcat"

version = "2.2.0-dev"
dynamic = ["version"]

description = "Medical Concept Annotation Toolkit (v2)"

Expand Down Expand Up @@ -33,7 +33,7 @@ classifiers = [
# 3 - Alpha
# 4 - Beta
# 5 - Production/Stable
"Development Status :: 4 - Beta",
"Development Status :: 5 - Production/Stable",

"Intended Audience :: Healthcare Industry",
# "Topic :: Natural Language Processing :: Named Entity Recognition and Linking",
Expand Down Expand Up @@ -128,9 +128,22 @@ test = [] # TODO - list
[build-system]
# These are the assumed default build requirements from pip:
# https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support
requires = ["setuptools>=43.0.0", "wheel"]
requires = ["setuptools>=43.0.0", "setuptools_scm>=8", "wheel"]
build-backend = "setuptools.build_meta"

[tool.setuptools]
package-dir = { "medcat" = "medcat" }

[tool.setuptools.packages.find]
include = ["medcat*"]

[tool.setuptools_scm]
# look for .git folder in root of repo
root = ".."
version_scheme = "post-release"
tag_regex = "^medcat/v(?P<version>\\d+(?:\\.\\d+)*)(?:[ab]\\d+|rc\\d+)?$"
local_scheme = "node-and-date"

[tool.ruff.lint]
# 1. Enable some extra checks for ruff
select = ["E", "F"]
Expand Down
Loading