Skip to content

Commit

Permalink
Merge branch 'main' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
guillaume-gricourt committed Aug 9, 2022
2 parents 79d3181 + 7f898fe commit 92d7562
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 31 deletions.
22 changes: 2 additions & 20 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,6 @@ jobs:
path: ${{ steps.update_version.outputs.version_path }}
retention-days: 1

Badge:
needs: Tag
runs-on: ubuntu-latest
steps:
- name: 'Badge version'
uses: schneegans/[email protected]
with:
auth: ${{ secrets.GIST }}
gistID: dcbec0ab9a7556f091c36e48a58980dd
filename: version.json
label: Version
message: ${{ needs.Tag.outputs.tag }}
color: green

Commit:
needs: [ Tag, Changelog, Version ]
runs-on: ubuntu-latest
Expand Down Expand Up @@ -154,10 +140,7 @@ jobs:

BuildPip:
needs: Commit
runs-on: ${{ matrix.os }}-latest
strategy:
matrix:
os: [ubuntu]
runs-on: ubuntu-latest
env:
bld_path: /tmp/build
asset: pip.zip
Expand All @@ -176,10 +159,9 @@ jobs:
with:
miniconda-version: "latest"
environment-file: conda.recipes/conda_build_env.yaml
activate-environment: build
python-version: '3.9'
- name: 'Build pip package'
run: |
pip install build
python3 -m build --outdir ${bld_path}
- name: 'Create asset'
run: |
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
on: ["push", "pull_request"]

name: Coverage

on:
push:
branches:
- main

jobs:

Coveralls:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu"]
python-version: ['3.7', '3.8', '3.9']
python-version: ['3.8', '3.9']
env:
bld_path: /tmp/build
defaults:
Expand All @@ -41,24 +41,22 @@ jobs:
- name: 'Deploying miniconda'
uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
miniconda-version: 'latest'
environment-file: conda.recipes/conda_build_env.yaml
activate-environment: build
python-version: ${{ matrix.python-version }}
- name: 'Set up output folder'
run: |
mkdir -p "${bld_path}"
- name: 'Build pip package'
run: |
pip install build
python3 -m build --outdir "${bld_path}"
Pytest:
needs: [Build]
runs-on: ${{ matrix.os }}-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9']
python-version: ['3.8', '3.9']
os: [ubuntu, macos]
env:
bld_path: /tmp/build
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@

## Installation

### Conda

```sh
conda install -c bioconda rpfbagr
```

### Docker

```sh
docker pull ghcr.io/brsynth/rpfbagr:<release version>
```

### Pip

Download asset from the last *Releases*.

* Unzip asset
Expand Down
7 changes: 3 additions & 4 deletions conda.recipes/conda_build_env.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
name: build
name: test
channels:
- bioconda
- conda-forge
- defaults
dependencies:
- anaconda-client
- biopython
- build
- cameo
- cobra<0.25.0
- conda-build
- markupsafe==2.0.1
- markupsafe=2.0.1
- pandas
- pytest
- python
- pyyaml

0 comments on commit 92d7562

Please sign in to comment.