Skip to content

Commit 92d7562

Browse files
Merge branch 'main' into stable
2 parents 79d3181 + 7f898fe commit 92d7562

File tree

5 files changed

+27
-31
lines changed

5 files changed

+27
-31
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,6 @@ jobs:
9898
path: ${{ steps.update_version.outputs.version_path }}
9999
retention-days: 1
100100

101-
Badge:
102-
needs: Tag
103-
runs-on: ubuntu-latest
104-
steps:
105-
- name: 'Badge version'
106-
uses: schneegans/[email protected]
107-
with:
108-
auth: ${{ secrets.GIST }}
109-
gistID: dcbec0ab9a7556f091c36e48a58980dd
110-
filename: version.json
111-
label: Version
112-
message: ${{ needs.Tag.outputs.tag }}
113-
color: green
114-
115101
Commit:
116102
needs: [ Tag, Changelog, Version ]
117103
runs-on: ubuntu-latest
@@ -154,10 +140,7 @@ jobs:
154140

155141
BuildPip:
156142
needs: Commit
157-
runs-on: ${{ matrix.os }}-latest
158-
strategy:
159-
matrix:
160-
os: [ubuntu]
143+
runs-on: ubuntu-latest
161144
env:
162145
bld_path: /tmp/build
163146
asset: pip.zip
@@ -176,10 +159,9 @@ jobs:
176159
with:
177160
miniconda-version: "latest"
178161
environment-file: conda.recipes/conda_build_env.yaml
179-
activate-environment: build
162+
python-version: '3.9'
180163
- name: 'Build pip package'
181164
run: |
182-
pip install build
183165
python3 -m build --outdir ${bld_path}
184166
- name: 'Create asset'
185167
run: |

.github/workflows/coverage.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
on: ["push", "pull_request"]
2-
31
name: Coverage
42

3+
on:
4+
push:
5+
branches:
6+
- main
7+
58
jobs:
69

710
Coveralls:

.github/workflows/test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
matrix:
2929
os: ["ubuntu"]
30-
python-version: ['3.7', '3.8', '3.9']
30+
python-version: ['3.8', '3.9']
3131
env:
3232
bld_path: /tmp/build
3333
defaults:
@@ -41,24 +41,22 @@ jobs:
4141
- name: 'Deploying miniconda'
4242
uses: conda-incubator/setup-miniconda@v2
4343
with:
44-
miniconda-version: "latest"
44+
miniconda-version: 'latest'
4545
environment-file: conda.recipes/conda_build_env.yaml
46-
activate-environment: build
4746
python-version: ${{ matrix.python-version }}
4847
- name: 'Set up output folder'
4948
run: |
5049
mkdir -p "${bld_path}"
5150
- name: 'Build pip package'
5251
run: |
53-
pip install build
5452
python3 -m build --outdir "${bld_path}"
5553
5654
Pytest:
5755
needs: [Build]
5856
runs-on: ${{ matrix.os }}-latest
5957
strategy:
6058
matrix:
61-
python-version: ['3.7', '3.8', '3.9']
59+
python-version: ['3.8', '3.9']
6260
os: [ubuntu, macos]
6361
env:
6462
bld_path: /tmp/build

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,20 @@
1010

1111
## Installation
1212

13+
### Conda
14+
15+
```sh
16+
conda install -c bioconda rpfbagr
17+
```
18+
19+
### Docker
20+
21+
```sh
22+
docker pull ghcr.io/brsynth/rpfbagr:<release version>
23+
```
24+
25+
### Pip
26+
1327
Download asset from the last *Releases*.
1428

1529
* Unzip asset

conda.recipes/conda_build_env.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
name: build
1+
name: test
22
channels:
33
- bioconda
44
- conda-forge
55
- defaults
66
dependencies:
77
- anaconda-client
88
- biopython
9+
- build
910
- cameo
1011
- cobra<0.25.0
11-
- conda-build
12-
- markupsafe==2.0.1
12+
- markupsafe=2.0.1
1313
- pandas
1414
- pytest
15-
- python
1615
- pyyaml

0 commit comments

Comments
 (0)