Merge pull request #2 from ggabernet/dev

update dev

.github/workflows/branch.yml

@@ -0,0 +1,16 @@
+name: nf-core branch protection
+# This workflow is triggered on PRs to master branch on the repository
+# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
+on:
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+    steps:
+      # PRs are only ok if coming from an nf-core `dev` branch or a fork `patch` branch
+      - name: Check PRs
+        run: |
+          { [[ $(git remote get-url origin) == *nf-core/tools ]] && [[ ${GITHUB_HEAD_REF} = "dev" ]]; } || [[ ${GITHUB_HEAD_REF} == "patch" ]]

.github/workflows/sync.yml

@@ -29,6 +29,11 @@ jobs:
           wget -qO- get.nextflow.io | bash
           sudo ln -s /tmp/nextflow/nextflow /usr/local/bin/nextflow
 
+      - name: Configure git
+        run: |
+          git config user.email "[email protected]"
+          git config user.name "nf-core-bot"
+
       - name: Run synchronisation
         if: github.repository == 'nf-core/tools'
         env:

CHANGELOG.md

@@ -1,5 +1,11 @@
 # nf-core/tools: Changelog
 
+## v1.10dev
+
+### Other
+
+* Added CI test to check for PRs against `master` in tools repo
+
 ## v1.9
 
 ### Continuous integration

README.md

@@ -1,8 +1,9 @@
 # ![nf-core/tools](docs/images/nfcore-tools_logo.png) <!-- omit in toc -->
 
-[![GitHub Actions CI Status](https://github.com/nf-core/tools/workflows/CI%20tests/badge.svg)](https://github.com/nf-core/tools/actions)
+[![Python tests](https://github.com/nf-core/tools/workflows/Python%20tests/badge.svg?branch=master&event=push)](https://github.com/nf-core/tools/actions?query=workflow%3A%22Python+tests%22+branch%3Amaster)
 [![codecov](https://codecov.io/gh/nf-core/tools/branch/master/graph/badge.svg)](https://codecov.io/gh/nf-core/tools)
-[![install with bioconda](https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg?style=flat-square)](http://bioconda.github.io/recipes/nf-core/README.html)
+[![install with Bioconda](https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg)](http://bioconda.github.io/recipes/nf-core/README.html)
+[![install with PyPI](https://img.shields.io/badge/install%20with-PyPI-blue.svg)](https://pypi.org/project/nf-core/)
 
 A python package with helper tools for the nf-core community.
 

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 import sys
 
-version = '1.9'
+version = '1.10dev'
 
 with open('README.md') as f:
     readme = f.read()