Merge remote-tracking branch 'origin/master'

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: [fccoelho] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/python-package.yml

@@ -30,9 +30,9 @@ jobs:
         use-mamba: true
         miniforge-variant: Mambaforge
 
-    - name: Install Dependencies
+    - name: Install dependencies
       run: |
-        curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
+        curl -sSL https://install.python-poetry.org/ | python -
         export PATH="$HOME/.poetry/bin:$PATH"
         poetry config virtualenvs.create false && poetry build && poetry install
 

Makefile

@@ -28,11 +28,11 @@ SERVICE :=
 #* Poetry
 .PHONY: poetry-download
 poetry-download:
-	curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | $(PYTHON) -
+	curl -sSL https://install.python-poetry.org | $(PYTHON) -
 
 .PHONY: poetry-remove
 poetry-remove:
-	curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | $(PYTHON) - --uninstall
+	curl -sSL https://install.python-poetry.org | $(PYTHON) - --uninstall
 
 #* Installation
 .PHONY: install

conda/dev.yaml

@@ -10,3 +10,7 @@ dependencies:
   - pip
   - psycopg2
   - python 3.9.*
+  - poetry
+  - pip:
+    - urllib3
+    - requests

docker/Dockerfile

@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ENV HOME "/home/pysus"
 ENV PATH "$PATH:/home/pysus/.local/bin"
-ENV ENV_NAME base
+ENV ENV_NAME pysus
 ENV PATH "/opt/conda/envs/$ENV_NAME/bin:$PATH"
 ENV PATH "/opt/poetry/bin:$PATH"
 
@@ -28,12 +28,13 @@ RUN useradd -ms /bin/bash pysus \
   && sudo chown -R pysus:pysus /usr/src
 
 COPY --chown=pysus:pysus conda/dev.yaml /tmp/dev.yaml
-COPY --chown=pysus:pysus docker/entrypoint.sh /entrypoint.sh
+COPY --chown=pysus:pysus docker/scripts/entrypoint.sh /entrypoint.sh
+COPY --chown=pysus:pysus docker/scripts/poetry_install.sh /tmp/poetry_install.sh
 COPY --chown=pysus:pysus pyproject.toml poetry.lock LICENSE README.md /usr/src/
 COPY --chown=pysus:pysus pysus /usr/src/pysus
 COPY --chown=pysus:pysus docs/source/*.ipynb /home/pysus/Notebooks/
 
-RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | POETRY_HOME=/opt/poetry python && \
+RUN curl -sSL https://install.python-poetry.org/ | POETRY_HOME=/opt/poetry python && \
     cd /usr/local/bin && \
     ln -s /opt/poetry/bin/poetry && \
     poetry config virtualenvs.create false
@@ -42,9 +43,10 @@ RUN chmod -R a+rwx /home/pysus/.config/pypoetry/
 
 USER pysus
 
-RUN mamba env update -n $ENV_NAME \
-    --file /tmp/dev.yaml \
-  && cd /usr/src && poetry build && poetry install \
+RUN mamba env create -n $ENV_NAME --file /tmp/dev.yaml \
+  && cd /usr/src \
+  && poetry build \
+  && poetry install \
   && mamba clean -afy
 
 WORKDIR /home/pysus/Notebooks