Update all to latest
Change-Id: I40c35f1e72dd3b068c5802171e2fa40c9d85fb10
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2b7a3c..2fb723a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
default:
- image: python:3.11
+ image: python:3.12-slim-bookworm
variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
@@ -14,8 +14,8 @@
- python -m venv venv
- source venv/bin/activate
- export PYTHONPATH=PYTHONPATH:.
- - cp $(find / -name longintrepr.h) /usr/local/include/python3.11/
- - pip install --use-pep517 -r requirements.txt
+ - venv/bin/pip install --upgrade pip
+ - pip install -r requirements.txt
- python -m spacy download de_core_news_lg
- apt update -y
- apt-get install cpanminus -y
diff --git a/Dockerfile b/Dockerfile
index 00bea0d..cde20de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,12 @@
-# Use the official Python 3.11 image
-FROM python:3.11-slim-bookworm
+# Use the official Python 3.12 image
+FROM python:3.12-slim-bookworm
# Set environment variables
ENV PIP_CACHE_DIR="/app/.cache/pip" \
PYTHONPATH="PYTHONPATH:."
ENV VIRTUAL_ENV=/app/venv
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+ENV MAKEFLAGS="-j$(nproc)"
# Set the working directory
COPY lib /app/lib
@@ -17,8 +18,8 @@
# Install Python dependencies and create a virtual environment
RUN mkdir -p "/app/logs"
RUN python -m venv venv
-RUN cp $(find / -name longintrepr.h) /usr/local/include/python3.11/
-RUN venv/bin/pip install --use-pep517 -r requirements.txt
+RUN venv/bin/pip install --upgrade pip
+RUN venv/bin/pip install -r requirements.txt
RUN . venv/bin/activate && python -m spacy download de_core_news_lg
# Define the entry point
diff --git a/README.md b/README.md
index 04c15c9..389c785 100644
--- a/README.md
+++ b/README.md
@@ -3,39 +3,40 @@
## Build and run as a Docker Image
```shell
-docker build -t conllu2spacy .
+docker build -t -t korap/conllu2spacy:latest .
```
Then run the image for example with:
```shell
-korapxml2conllu rei.zip | docker run -i conllu2spacy | conllu2korapxml > rei.spacy.zip
+korapxml2conllu rei.zip | docker run -i korap/conllu2spacy | conllu2korapxml > rei.spacy.zip
```
## Build locally and install Requirements
### Create a Virtual Environment
-```
- python3 -m venv venv
- source venv/bin/activate
- export PYTHONPATH=PYTHONPATH:.
+
+```shell
+python3 -m venv venv
+source venv/bin/activate
+export PYTHONPATH=PYTHONPATH:.
```
### Install Libraries (as needed)
-#### SpaCy 2.x
+#### SpaCy
```
pip install -U pip setuptools wheel
-pip install -U spacy==2.3.2
+pip install -U spacy
```
For more details you can visit the [official website](https://spacy.io/usage#quickstart)
#### Germalemma
-```
+```shell
pip install -U germalemma
```
diff --git a/requirements.txt b/requirements.txt
index 4e3502d..46c867c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
pip
wheel
thinc
-spacy==2.3.9
+spacy
germalemma