Skip to content

Commit

Permalink
Switch to miniforge from miniconda, no default channel
Browse files Browse the repository at this point in the history
  • Loading branch information
the-other-james committed Sep 23, 2024
1 parent f3d4c33 commit 6ae116f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ jobs:
environment-file: environment_dev.yml
python-version: ${{ matrix.python-version }}
auto-activate-base: false
miniforge-version: latest
- name: Lint Project
shell: bash -l {0}
run: pylint onair plugins test
- name: Check Formatting
shell: bash -l {0}
run: black --check .
run: black --check .
- name: Confirm no defaults
run: conda config --show channels
3 changes: 3 additions & 0 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
environment-file: environment_dev.yml
python-version: ${{ matrix.python-version }}
auto-activate-base: false
miniforge-version: latest
- name: Install dependencies
shell: bash -l {0}
run: |
Expand All @@ -33,3 +34,5 @@ jobs:
run: coverage report --skip-empty
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v4
- name: Confirm no defaults
run: conda config --show channels
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[MAIN]

exit-zero=True
exit-zero=True
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ USER onair_dev
ENV CONDA_DIR /home/onair_dev/conda
RUN \
mkdir -p $CONDA_DIR && \
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
bash ~/miniconda.sh -b -u -p $CONDA_DIR && \
rm -rf ~/miniconda.sh
wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O ~/miniforge.sh && \
bash ~/miniforge.sh -b -u -p $CONDA_DIR && \
rm -rf ~/miniforge.sh
ENV PATH=$CONDA_DIR/bin:$PATH

# Make OnAir requirements file accessible by onair_dev user
COPY environment.yml /home/onair_dev/environment.yml
COPY environment_dev.yml /home/onair_dev/environment.yml
RUN \
. $CONDA_DIR/etc/profile.d/conda.sh && \
conda init bash && \
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: onair
channels:
- default
- conda-forge
- nodefaults
dependencies:
- python>=3.8,<3.13
- numpy
Expand Down
2 changes: 1 addition & 1 deletion environment_dev.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: onair
channels:
- default
- conda-forge
- nodefaults
dependencies:
- python>=3.8,<3.13
- numpy
Expand Down

0 comments on commit 6ae116f

Please sign in to comment.