Skip to content

Commit

Permalink
WIP remove requirements-dev.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
mfisher87 committed Sep 10, 2023
1 parent 99922db commit 54f685d
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 60 deletions.
27 changes: 16 additions & 11 deletions .github/workflows/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@ on:
branches:
- main

# Default to bash in login mode; key to activating conda environment
# https://github.com/mamba-org/provision-with-micromamba#IMPORTANT
defaults:
run:
shell: "bash -l {0}"

permissions:
contents: write
pages: write

env:
MICROMAMBA_VERSION: 'latest'

jobs:
build:
name: Deploy docs
Expand All @@ -19,19 +28,15 @@ jobs:
submodules: "recursive"
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
architecture: 'x64'
- name: Install dependencies
run: |
python3 -m pip install --upgrade pip # install pip
python3 -m pip install -r requirements-dev.txt # install dev deps
uses: "mamba-org/setup-micromamba@v1"
with:
micromamba-version: "${{ env.MICROMAMBA_VERSION }}"
environment-file: "environments/dev-environment.yaml"
cache-environment: true

- name: Install conda-lock
run: |
python3 -m pip install .
run: "pip install ."

- name: Build site
run: mkdocs build
Expand All @@ -42,4 +47,4 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./site
user_name: 'github-actions[bot]'
user_email: 'github-actions[bot]@users.noreply.github.com'
user_email: 'github-actions[bot]@users.noreply.github.com'
25 changes: 2 additions & 23 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,10 @@ jobs:
uses: mamba-org/setup-micromamba@v1
with:
micromamba-version: ${{ env.MICROMAMBA_VERSION }}
environment-name: test-env
environment-file: environments/dev-environment.yaml
init-shell: powershell
create-args: >-
python=3.11
mamba
pip
pytest-cov
pytest-xdist
- name: Install dev deps
run: |
python -m pip install -r requirements-dev.txt
- name: install conda-lock
run: |
Expand Down Expand Up @@ -78,23 +70,10 @@ jobs:
- uses: mamba-org/setup-micromamba@v1
with:
micromamba-version: ${{ env.MICROMAMBA_VERSION }}
environment-name: test-env
environment-file: environments/dev-environment.yaml
init-shell: bash
create-args: >-
python=${{ matrix.python-version }}
mamba
pip
pytest-cov
pytest-xdist
- name: Install dev deps
shell: bash -eo pipefail -l {0}
run: |
set -x
echo "${PATH}"
which pip
which python
python -m pip install -r requirements-dev.txt
- name: install conda-lock
shell: bash -eo pipefail -l {0}
Expand Down
6 changes: 0 additions & 6 deletions environments/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
mamba activate conda-lock-dev
```

or:

```
pip install requirements-dev.txt
```

* Then, install `conda-lock` in editable mode. This will also install its runtime
dependencies as defined in `pyproject.toml`.

Expand Down
1 change: 1 addition & 0 deletions environments/dev-environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ channels:
- conda-forge
- nodefaults
dependencies:
- mamba
- black
- check-manifest
- doctr
Expand Down
20 changes: 0 additions & 20 deletions requirements-dev.txt

This file was deleted.

0 comments on commit 54f685d

Please sign in to comment.