chore: move to pyproject and poetry

Author: Panaetius

.dockerignore

@@ -1,7 +1,9 @@
 .*
 **
 !renku/**
-!setup.py
+!pyproject.toml
+!poetry.lock
+!build.py
 !*.rst
 !entrypoint-svc.sh
 !.git

.github/workflows/test_deploy.yml

@@ -45,7 +45,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install coveralls setuptools wheel
+        python -m pip install coveralls wheel
         python -m pip install .[all]
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
@@ -68,9 +68,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install coveralls setuptools wheel
+        python -m pip install coveralls poetry wheel
         python -m pip install .[all]
-        python setup.py --version
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
     - name: Test docs
@@ -92,10 +91,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install poetry wheel twine gitpython
         python -m pip install .[all]
     - name: Build Package
-      run: python setup.py sdist bdist_wheel
+      run: poetry build
     - name: test with twine
       run: twine check dist/*
 
@@ -121,9 +120,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install coveralls setuptools wheel
+        python -m pip install coveralls poetry wheel
         python -m pip install .[nodocs]
-        python setup.py --version
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
     - name: Test with pytest
@@ -162,9 +160,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install coveralls setuptools wheel
+        python -m pip install coveralls poetry wheel
         python -m pip install .[nodocs]
-        python setup.py --version
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
     - name: Test with pytest
@@ -208,9 +205,8 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install coveralls setuptools wheel
+          python -m pip install coveralls poetry wheel
           python -m pip install .[nodocs]
-          python setup.py --version
           git config --global --add user.name "Renku @ SDSC"
           git config --global --add user.email "[email protected]"
       - name: Test with pytest
@@ -254,9 +250,8 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install coveralls setuptools wheel
+          python -m pip install coveralls poetry wheel
           python -m pip install .[nodocs]
-          python setup.py --version
           git config --global --add user.name "Renku @ SDSC"
           git config --global --add user.email "[email protected]"
       - name: Test with pytest
@@ -295,7 +290,7 @@ jobs:
         curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
         brew install shellcheck node || brew link --overwrite node
         python -m pip install --upgrade pip
-        python -m pip install setuptools wheel twine
+        python -m pip install wheel twine
         python -m pip install .[all]
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
@@ -328,7 +323,7 @@ jobs:
         curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
         brew install shellcheck node || brew link --overwrite node
         python -m pip install --upgrade pip
-        python -m pip install setuptools wheel twine
+        python -m pip install wheel twine
         python -m pip install .[all]
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
@@ -367,7 +362,7 @@ jobs:
           curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
           brew install shellcheck node || brew link --overwrite node
           python -m pip install --upgrade pip
-          python -m pip install setuptools wheel twine
+          python -m pip install wheel twine
           python -m pip install .[all]
           git config --global --add user.name "Renku @ SDSC"
           git config --global --add user.email "[email protected]"
@@ -406,7 +401,7 @@ jobs:
           curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
           brew install shellcheck node || brew link --overwrite node
           python -m pip install --upgrade pip
-          python -m pip install setuptools wheel twine
+          python -m pip install wheel twine
           python -m pip install .[all]
           git config --global --add user.name "Renku @ SDSC"
           git config --global --add user.email "[email protected]"
@@ -439,7 +434,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install coveralls setuptools wheel
+        python -m pip install coveralls wheel
         python -m pip install .[nodocs]
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
@@ -494,7 +489,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install coveralls setuptools wheel
+        python -m pip install coveralls wheel
         python -m pip install .[nodocs]
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
@@ -550,7 +545,7 @@ jobs:
         curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
         brew install shellcheck node || brew link --overwrite node
         python -m pip install --upgrade pip
-        python -m pip install setuptools wheel
+        python -m pip install wheel
         python -m pip install .[all]
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
@@ -590,7 +585,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install poetry wheel twine
         python -m pip install .[all]
         git config --global --add user.name "Renku @ SDSC"
         git config --global --add user.email "[email protected]"
@@ -601,7 +596,7 @@ jobs:
         export GIT_TAG=$(renku --version)
         git tag $GIT_TAG
     - name: Build Package
-      run: python setup.py sdist bdist_wheel
+      run: poetry build
     - name: Publish a Python distribution to PyPI
       uses: pypa/gh-action-pypi-publish@master
       with:

.gitignore

@@ -1,6 +1,3 @@
-# Automatically generated by setuptools_scm
-renku/version.py
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 .pytest_cache/

.tx/config

@@ -2,16 +2,15 @@ FROM python:3.7-slim as base
 
 RUN apt-get update && \
     apt-get install -y git && \
-    pip install --no-cache --upgrade pip requirements-builder
+    pip install --no-cache --upgrade pip poetry
 
 FROM base as builder
 
 # The python install is done in two steps to avoid re-installing all dependencies every
 # time the code changes
-COPY setup.py README.rst CHANGES.rst /code/renku/
-COPY renku/version.py.tmpl /code/renku/renku/version.py.tmpl
+COPY pyproject.toml build.py poetry.lock README.rst CHANGES.rst /code/renku/
 WORKDIR /code/renku
-RUN requirements-builder --level=pypi setup.py > /tmp/requirements.txt && \
+RUN poetry export --without-hashes -f requirements.txt --output /tmp/requirements.txt && \
     pip install -r /tmp/requirements.txt
 
 COPY .git /code/renku/.git

Dockerfile.cli

@@ -2,16 +2,15 @@ FROM python:3.7-slim as base
 
 RUN apt-get update && \
     apt-get install -y git && \
-    pip install --no-cache --upgrade pip requirements-builder
+    pip install --no-cache --upgrade pip poetry
 
 FROM base as builder
 
 # The python install is done in two steps to avoid re-installing all dependencies every
 # time the code changes
-COPY setup.py README.rst CHANGES.rst /code/renku/
-COPY renku/version.py.tmpl /code/renku/renku/version.py.tmpl
+COPY pyproject.toml build.py poetry.lock README.rst CHANGES.rst /code/renku/
 WORKDIR /code/renku
-RUN requirements-builder -e service --level=pypi setup.py > /tmp/requirements.txt && \
+RUN poetry export --without-hashes -f requirements.txt --output /tmp/requirements.txt && \
     pip install -r /tmp/requirements.txt
 
 COPY .git /code/renku/.git

Dockerfile.svc

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2017-2021 - Swiss Data Science Center (SDSC)
+# A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
+# Eidgenössische Technische Hochschule Zürich (ETHZ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Build script executed by Poetry."""
+
+import shutil
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+URL = "https://github.com/SwissDataScienceCenter/renku-project-template"
+REFERENCE = "0.1.23"
+
+
+def build() -> None:
+    from git import Repo
+
+    with TemporaryDirectory() as tempdir:
+        # download and extract template data
+        print("downloading Renku templates...")
+        repo = Repo.clone_from(URL, tempdir)
+
+        repo.git.checkout(REFERENCE)
+
+        # copy templates
+        current_path = Path.cwd()
+        template_path = current_path / "renku" / "templates"
+        build_path = current_path / "build" / "lib" / "renku" / "templates"
+        if template_path.exists():
+            shutil.rmtree(str(template_path))
+        if build_path.exists():
+            shutil.rmtree(str(build_path))
+        shutil.copytree(tempdir, str(template_path), ignore=shutil.ignore_patterns(".git"))
+        shutil.copytree(tempdir, str(build_path), ignore=shutil.ignore_patterns(".git"))
+
+
+if __name__ == "__main__":
+    build()