Merge remote-tracking branch 'upstream-spa/main'

Author: Dominik Falkner

{{ cookiecutter.__package_name_kebab_case }}/Dockerfile-base

@@ -33,7 +33,9 @@ ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 RUN set -ex \
     && curl https://pyenv.run | bash \
     && pyenv update \
-    && eval "$(pyenv init -)" && pyenv --version
+    && eval "$(pyenv init -)" \
+    # activate pyenv on shell start
+    && pyenv init - > ~/.bashrc
 
 # Install python and set interpreter
 RUN pyenv install -s ${PYTHON_VERSION} && pyenv global ${PYTHON_VERSION}

{{ cookiecutter.__package_name_kebab_case }}/Dockerfile-cuda

@@ -37,7 +37,9 @@ ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 RUN set -ex \
     && curl https://pyenv.run | bash \
     && pyenv update \
-    && eval "$(pyenv init -)" && pyenv --version
+    && eval "$(pyenv init -)" \
+    # activate pyenv on shell start
+    && pyenv init - > ~/.bashrc
 
 # Install python and set interpreter
 RUN pyenv install -s ${PYTHON_VERSION} && pyenv global ${PYTHON_VERSION}
@@ -62,4 +64,4 @@ RUN poetry install --all-extras --no-root
 # Copy the rest of the repository
 ADD . .
 
-ENTRYPOINT ["tail", "-f", "/dev/null"]
+ENTRYPOINT ["tail", "-f", "/dev/null"]

{{ cookiecutter.__package_name_kebab_case }}/Dockerfile-test

@@ -33,7 +33,9 @@ ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 RUN set -ex \
     && curl https://pyenv.run | bash \
     && pyenv update \
-    && eval "$(pyenv init -)" && pyenv --version
+    && eval "$(pyenv init -)" \
+    # activate pyenv on shell start
+    && pyenv init - > ~/.bashrc
 
 # Install python and set interpreter
 RUN pyenv install -s ${PYTHON_VERSION} && pyenv global ${PYTHON_VERSION}

…r.__package_name_kebab_case }}/README.MD …r.__package_name_kebab_case }}/README.md{{ cookiecutter.__package_name_kebab_case }}/README.MD renamed to {{ cookiecutter.__package_name_kebab_case }}/README.md {{ cookiecutter.__package_name_kebab_case }}/README.MD renamed to {{ cookiecutter.__package_name_kebab_case }}/README.md

@@ -11,7 +11,7 @@ description = "{{ cookiecutter.package_description }}"
 authors = [
   "{{ cookiecutter.author_name }} <{{ cookiecutter.author_email }}>"
 ]
-readme = "README.MD"
+readme = "README.md"
 repository = "{{ cookiecutter.package_url }}"
 packages = [
   { include = "{{cookiecutter.__package_name_snake_case}}" }