Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

155 deal with anaconda licensing changes #156

Merged
merged 9 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ jobs:
with:
activate-environment: onair
environment-file: environment_dev.yml
channels: conda-forge, nodefaults
python-version: ${{ matrix.python-version }}
auto-activate-base: false
miniforge-version: latest
- name: Lint Project
shell: bash -l {0}
run: pylint onair plugins test
run: |
conda config --remove channels defaults
pylint onair plugins test
- name: Check Formatting
shell: bash -l {0}
run: black --check .
run: black --check .
- name: Confirm no defaults
asgibson marked this conversation as resolved.
Show resolved Hide resolved
run: conda config --show channels
5 changes: 5 additions & 0 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ jobs:
with:
activate-environment: onair
environment-file: environment_dev.yml
channels: conda-forge, nodefaults
python-version: ${{ matrix.python-version }}
auto-activate-base: false
miniforge-version: latest
- name: Install dependencies
shell: bash -l {0}
run: |
conda info
conda config --remove channels defaults
conda list
- name: Test with pytest
shell: bash -l {0}
Expand All @@ -33,3 +36,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
asgibson marked this conversation as resolved.
Show resolved Hide resolved
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
asgibson marked this conversation as resolved.
Show resolved Hide resolved
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
Loading