Skip to content

Commit 1158683

Browse files
authored
Merge pull request #153 from FNNDSC/fix-pixi
Fix dependency installation using pixi
2 parents 6b8eb88 + 0e3da56 commit 1158683

File tree

23 files changed

+2024
-4546
lines changed

23 files changed

+2024
-4546
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ jobs:
4646
with:
4747
cache-downloads: true
4848
- name: Install pixi
49-
uses: prefix-dev/setup-pixi@v0.8.1
49+
uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
5050
with:
51-
pixi-version: v0.38.0
51+
pixi-version: v0.55.0
5252
run-install: false
5353
- name: Set version
5454
if: startsWith(github.ref, 'refs/tags/v')

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/prefix-dev/pixi:0.38.0 AS install
1+
FROM ghcr.io/prefix-dev/pixi:0.55.0 AS install
22

33
COPY . /app
44
WORKDIR /app

README.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ different compute and storage environments. The currently supported storage opti
7979
Below are some examples of how to start the different dev environments. Consult the header of the ``make.sh`` script for more
8080
information on the different command line flags combinations supported by the script.
8181

82+
Local Development
83+
=================
84+
85+
This project uses a package manager called ``pixi``. For more information,
86+
read https://github.com/FNNDSC/pfcon/issues/152
87+
8288
Docker-based development environment (default)
8389
==============================================
8490

pfcon/compute/cromwell/__init__.py

Whitespace-only changes.

pfcon/compute/cromwell/client.py

Lines changed: 0 additions & 97 deletions
This file was deleted.

pfcon/compute/cromwell/models.py

Lines changed: 0 additions & 145 deletions
This file was deleted.

pfcon/compute/cromwell/slurm/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)