Merge pull request #72 from nucypher/development

Next Porter Release - Candidate for v3.7.0

.github/workflows/darker.yml

@@ -11,7 +11,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.12'
       - uses: akaihola/[email protected]
         with:
           version: "1.7.2"  # defaults to same version, but can be modified

.github/workflows/ruff.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.12"
 
       - name: Install dependencies
         run: |
@@ -22,4 +22,4 @@ jobs:
           pip install .
 
       - name: Lint with Ruff
-        run: ruff --output-format=github porter
+        run: ruff check --output-format=github porter

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.11"]
+        python-version: ["3.9", "3.12"]
 
     steps:
     - uses: actions/checkout@v4
@@ -49,7 +49,7 @@ jobs:
 
     - name: Upload test coverage to Codecov
       if: matrix.python-version == '3.9'
-      uses: codecov/codecov-action@v4.3.0
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: true

Pipfile

@@ -7,13 +7,13 @@ name = "pypi"
 python_version = "3"
 
 [packages]
-nucypher = {git = "https://github.com/nucypher/nucypher.git", ref = "v7.3.0"}
+nucypher = {git = "https://github.com/nucypher/nucypher.git", ref = "v7.4.0"}
 nucypher-core = "==0.13.0"  # must be the same as nucypher
 flask-cors = "*"
 prometheus-flask-exporter = "*"
 
 [dev-packages]
-nucypher = {git = "https://github.com/nucypher/nucypher.git", editable = true, ref = "v7.3.0", extras = ["dev"]}  # needed for testerchain, and must be editable
+nucypher = {git = "https://github.com/nucypher/nucypher.git", editable = true, ref = "v7.4.0", extras = ["dev"]}  # needed for testerchain, and must be editable
 pytest = "<7"  # match with nucypher/nucypher
 pytest-cov = "*"
 pytest-mock = "*"

README.rst

@@ -339,6 +339,9 @@ Parameters
 |                                  |                  | | are greater than this max default value are  |
 |                                  |                  | | capped at the default value                  |
 +----------------------------------+------------------+------------------------------------------------+
+| ``min_version``                  | *(Optional)*     | | Minimum acceptable version of Ursula.        |
+|                                  | VersionString    | |                                              |
++----------------------------------+------------------+------------------------------------------------+
 
 
 Returns

deploy/docker/Dockerfile

@@ -1,13 +1,20 @@
-FROM nucypher/rust-python:3.8.12
+FROM nucypher/rust-python:3.12.0
 
-# Update
-RUN apt-get update -y && apt upgrade -y
-RUN apt-get install patch gcc libffi-dev wget git -y
+# set default user
+USER $USER
 
+# set default in-container workdir
 WORKDIR /code
 COPY . /code
 
-# Porter requirements
-RUN pip3 install .
+# Layer 1: Install dependencies
+COPY requirements.txt /code
+RUN pip3 install --no-cache-dir -r requirements.txt
 
+# Layer 2: Install porter entrypoint
+COPY . /code
+RUN pip3 install . --no-deps
+
+# Layer 3: Set environment variables
+RUN export PATH="$HOME/.local/bin:$PATH"
 CMD ["/bin/bash"]

deploy/docker/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   porter-http:
     restart: on-failure