wip: poetry

Author: aaxelb

.github/workflows/run_tests.yml

@@ -13,8 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10']  # TODO: 3.11, 3.12
-        postgres-version: ['15', '17']
+        python-version: ['3.10', '3.13']
+        postgres-version: ['17']
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -54,20 +54,17 @@ jobs:
       - name: install non-py dependencies
         run: sudo apt-get update && sudo apt-get install -y libxml2-dev libxslt1-dev libpq-dev git gcc
 
-      - name: set up python${{ matrix.python-version }}
+      - name: Install poetry
+        run: pipx install poetry
+
+      - name: setup python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: pip
-          cache-dependency-path: |
-            requirements.txt
-            dev-requirements.txt
-
-      - name: install py dependencies
-        run: pip install -r dev-requirements.txt
+          cache: 'poetry'
 
-      - name: install share
-        run: python setup.py develop
+      - name: install depondencies
+        run: poetry install --with dev
 
       - name: flake it
         run: flake8 .

Dockerfile

@@ -25,20 +25,25 @@ RUN update-ca-certificates
 RUN mkdir -p /code
 WORKDIR /code
 
-RUN pip install -U pip
-RUN pip install uwsgi==2.0.27
+ENV POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_OPTIONS_ALWAYS_COPY=1 \
+    POETRY_VIRTUALENVS_CREATE=0 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    POETRY_CACHE_DIR=/tmp/poetry-cache \
+    POETRY_HOME=/tmp/poetry
 
-COPY ./requirements.txt /code/requirements.txt
-COPY ./constraints.txt /code/constraints.txt
+RUN python -m venv $POETRY_HOME
 
-RUN pip install --no-cache-dir -c /code/constraints.txt -r /code/requirements.txt
+RUN $POETRY_HOME/bin/pip install poetry==2.1.1
+
+COPY ./ /code/
+
+RUN $POETRY_HOME/bin/poetry install --no-root --compile
 
 RUN apt-get remove -y \
     gcc \
     zlib1g-dev
 
-COPY ./ /code/
-
 RUN python manage.py collectstatic --noinput
 
 ARG GIT_TAG=
@@ -53,7 +58,9 @@ CMD ["python", "manage.py", "--help"]
 ### Dist
 FROM app AS dist
 
+RUN $POETRY_HOME/bin/poetry install --no-root --compile --only dist
+
 ### Dev
 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 --no-root --compile --only dev 

dev-requirements.txt

@@ -151,12 +151,10 @@ services:
       - -c
       - apt-get update &&
         apt-get install -y gcc &&
-        pip install -r requirements.txt -r dev-requirements.txt &&
-        (python3 -m compileall /usr/local/lib/python3.13 || true) &&
+        $POETRY_HOME/bin/poetry install --no-root --compile --with dev &&
         rm -Rf /python3.13/* &&
         apt-get remove -y gcc &&
-        cp -Rf -p /usr/local/lib/python3.13 / &&
-        python3 setup.py develop
+        cp -Rf -p /usr/local/lib/python3.13 /
     restart: 'no'
     volumes:
       - ./:/code:cached

docker-compose.yml

@@ -469,41 +469,6 @@ def route_urgent_task(name, args, kwargs, options, task=None, **kw):
 
 HIDE_DEPRECATED_VIEWS = parse_booly_str(os.environ.get('HIDE_DEPRECATED_VIEWS', 'False'))
 
-# Regulator pipeline, names of setuptools entry points
-SHARE_REGULATOR_CONFIG = {
-    'NODE_STEPS': [
-        'tokenize_tags',
-        'whitespace',
-        'normalize_agent_names',
-        'cited_as',
-        ('normalize_iris', {
-            'node_types': ['workidentifier'],
-            'blocked_schemes': ['mailto'],
-            'blocked_authorities': ['issn', 'orcid.org'],
-        }),
-        ('normalize_iris', {
-            'node_types': ['agentidentifier'],
-            'blocked_schemes': ['mailto'],
-            'blocked_authorities': ['secure.gravatar.com'],
-        }),
-        ('trim_cycles', {
-            'node_types': ['abstractworkrelation', 'abstractagentrelation'],
-            'relation_fields': ['subject', 'related'],
-        }),
-        ('trim_cycles', {
-            'node_types': ['subject'],
-            'relation_fields': ['central_synonym'],
-            'delete_node': False,
-        }),
-    ],
-    'GRAPH_STEPS': [
-        'deduplicate',
-    ],
-    'VALIDATE_STEPS': [
-        'jsonld_validator',
-    ],
-}
-
 # API KEYS
 DATAVERSE_API_KEY = os.environ.get('DATAVERSE_API_KEY')
 PLOS_API_KEY = os.environ.get('PLOS_API_KEY')

project/settings.py

@@ -1,6 +1,65 @@
+[project]
+name = "SHARE/trove"
+version = "25.1.1"  # TODO: get version from share/version.py
+description = ""
+authors = [
+    {name = "CenterForOpenScience", email = "share-support@cos.io"}
+]
+readme = "README.md"
+requires-python = "=3.13"
+dependencies = [
+    "bcrypt==4.3.0",  # Apache 2.0
+    "celery==5.4.0",  # BSD 3 Clause
+    "colorlog==6.9.0",  # MIT
+    "django-allauth==65.5.0",  # MIT
+    "django-celery-beat==2.7.0",  # BSD 3 Clause
+    "django-cors-headers==4.7.0",  # MIT
+    "django-extensions==3.2.3",  # MIT
+    "django-filter==25.1",  # BSD
+    "django-oauth-toolkit==3.0.1",  # BSD
+    "django==5.2",  # BSD 3 Clause
+    "elasticsearch8==8.17.2",  # Apache 2.0
+    "lxml==5.3.0",  # BSD
+    "kombu==5.5.0",  # BSD 3 Clause
+    "markdown2==2.5.3",  # MIT
+    "psycopg2==2.9.10",  # LGPL with exceptions or ZPL
+    "rdflib==7.1.3",  # BSD 3 Clause
+    "requests==2.32.3",  # Apache 2.0
+    "primitive_metadata==0.2025.1",  # MIT
+
+    # relevant only in deployment:
+    "sentry-sdk[django]==2.24.1",  # MIT
+    "gevent==24.11.2",  # MIT
+    "psycogreen==1.0.2",  # BSD
+
+    # to be removed in future work:
+    "djangorestframework==3.16.0",  # BSD
+    "djangorestframework-jsonapi==7.1.0",  # BSD
+    "elasticsearch5==5.5.6",  # Apache 2.0
+    "PyJWE==1.0.0", # Apache 2.0
+]
+
+[tool.poetry.group.dist]
+optional = true
+[tool.poetry.group.dist.dependencies]
+uwsgi = "2.0.28"
+newrelic = "10.7.0"  # newrelic APM agent, Custom License
+
+[tool.poetry.group.dev]
+optional = true
+[tool.poetry.group.dev.dependencies]
+coveralls = "3.3.1"
+django-debug-toolbar = "5.1.0"
+factory-boy = "3.3.3"
+faker = "37.1.0"
+flake8 = "7.2.0"
+pytest-benchmark = "5.1.0"
+pytest = "8.3.5"
+pytest-django = "4.11.1"
+
 [build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
+requires = ["poetry-core>=2.0.0,<3.0.0"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.coverage.run]
 omit = ["tests/*"]

pyproject.toml

@@ -7,9 +7,6 @@ max-line-length = 250
 ignore = E501,W503,F403,E266,F405
 exclude = ./scratch/*
 
-[behave]
-paths=./tests/features
-
 [tool:pytest]
 DJANGO_SETTINGS_MODULE=project.settings
 addopts = --benchmark-skip