From d0a338e0d2965d2f2b222e3b66ef144d2ce25f0d Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Tue, 16 Mar 2021 08:37:33 -0600 Subject: [PATCH 1/5] Create separate upstream-dev CI workflow --- .github/workflows/ci-upstream-dev.yaml | 30 ++++++++++++++++++++++++++ .github/workflows/ci.yaml | 30 -------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/ci-upstream-dev.yaml diff --git a/.github/workflows/ci-upstream-dev.yaml b/.github/workflows/ci-upstream-dev.yaml new file mode 100644 index 00000000..2060fc10 --- /dev/null +++ b/.github/workflows/ci-upstream-dev.yaml @@ -0,0 +1,30 @@ +name: Upstream-dev CI +on: + schedule: + - cron: '0 0 * * *' # Daily “At 00:00” +jobs: + upstream-dev: + name: upstream-dev + runs-on: ubuntu-latest + defaults: + run: + shell: bash -l {0} + steps: + - uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v2 + with: + channels: conda-forge + channel-priority: strict + mamba-version: '*' + activate-environment: pop-tools-dev + auto-update-conda: false + python-version: 3.8 + - name: Set up conda environment + run: | + mamba env update -f ci/environment-upstream-dev.yml + python -m pip install . + conda list + + - name: Run Tests + run: | + python -m pytest --cov=./ --cov-report=xml --verbose diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e04c2203..28e6b133 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,11 +1,7 @@ name: CI on: push: - branches: - - '*' pull_request: - branches: - - '*' schedule: - cron: '0 0 * * *' # Daily “At 00:00” workflow_dispatch: # allows you to trigger manually @@ -50,29 +46,3 @@ jobs: env_vars: OS,PYTHON name: codecov-umbrella fail_ci_if_error: false - - upstream-dev: - name: upstream-dev - runs-on: ubuntu-latest - defaults: - run: - shell: bash -l {0} - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2 - with: - channels: conda-forge - channel-priority: strict - mamba-version: '*' - activate-environment: pop-tools-dev - auto-update-conda: false - python-version: 3.8 - - name: Set up conda environment - run: | - mamba env update -f ci/environment-upstream-dev.yml - python -m pip install . - conda list - - - name: Run Tests - run: | - python -m pytest --cov=./ --cov-report=xml --verbose From 08a1592be8aa6b21a216eace698559690eb6c72d Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Tue, 16 Mar 2021 08:37:44 -0600 Subject: [PATCH 2/5] Add dependabot config --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..bad6ba3f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + - package-ecosystem: 'github-actions' + directory: '/' + schedule: + # Check for updates once a week + interval: 'weekly' From 255fa3e2fa76f78ec66fa2f8c9731f1e49d7c062 Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Tue, 16 Mar 2021 08:42:25 -0600 Subject: [PATCH 3/5] Add workflow for cancelling duplicate runs --- .github/workflows/cancel-duplicate-runs.yaml | 14 ++++++++++++++ .github/workflows/ci-upstream-dev.yaml | 7 +++---- .github/workflows/ci.yaml | 6 +++--- 3 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/cancel-duplicate-runs.yaml diff --git a/.github/workflows/cancel-duplicate-runs.yaml b/.github/workflows/cancel-duplicate-runs.yaml new file mode 100644 index 00000000..180a1d97 --- /dev/null +++ b/.github/workflows/cancel-duplicate-runs.yaml @@ -0,0 +1,14 @@ +name: Cancel +on: + workflow_run: + workflows: ['CI'] + types: + - requested +jobs: + cancel: + name: Cancel previous runs + runs-on: ubuntu-latest + steps: + - uses: styfle/cancel-workflow-action@0.8.0 + with: + workflow_id: ${{ github.event.workflow.id }} diff --git a/.github/workflows/ci-upstream-dev.yaml b/.github/workflows/ci-upstream-dev.yaml index 2060fc10..31088185 100644 --- a/.github/workflows/ci-upstream-dev.yaml +++ b/.github/workflows/ci-upstream-dev.yaml @@ -19,12 +19,11 @@ jobs: activate-environment: pop-tools-dev auto-update-conda: false python-version: 3.8 - - name: Set up conda environment + environment-file: ci/environment-upstream-dev.yml + - name: Install pop-tools run: | - mamba env update -f ci/environment-upstream-dev.yml - python -m pip install . + python -m pip install . --no-deps conda list - - name: Run Tests run: | python -m pytest --cov=./ --cov-report=xml --verbose diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 28e6b133..5056fcde 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,11 +27,11 @@ jobs: activate-environment: pop-tools-dev auto-update-conda: false python-version: ${{ matrix.python-version }} + environment-file: ci/environment.yml - - name: Set up conda environment + - name: Install pop-tools run: | - mamba env update -f ci/environment.yml - python -m pip install . + python -m pip install . --no-deps conda list - name: Run Tests From 29798722c662a38fd366fd5858a9d6847ac86079 Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Tue, 16 Mar 2021 08:44:20 -0600 Subject: [PATCH 4/5] Use nodefaults channel --- .github/workflows/ci-upstream-dev.yaml | 2 +- .github/workflows/ci.yaml | 2 +- ci/environment-upstream-dev.yml | 1 + ci/environment.yml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-upstream-dev.yaml b/.github/workflows/ci-upstream-dev.yaml index 31088185..e9649f31 100644 --- a/.github/workflows/ci-upstream-dev.yaml +++ b/.github/workflows/ci-upstream-dev.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2 with: - channels: conda-forge + channels: conda-forge,nodefaults channel-priority: strict mamba-version: '*' activate-environment: pop-tools-dev diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5056fcde..2fc45cab 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2 with: - channels: conda-forge + channels: conda-forge,nodefaults channel-priority: strict mamba-version: '*' activate-environment: pop-tools-dev diff --git a/ci/environment-upstream-dev.yml b/ci/environment-upstream-dev.yml index d2235a4e..5e93d143 100644 --- a/ci/environment-upstream-dev.yml +++ b/ci/environment-upstream-dev.yml @@ -1,6 +1,7 @@ name: pop-tools-dev channels: - conda-forge + - nodefaults dependencies: - bottleneck - codecov diff --git a/ci/environment.yml b/ci/environment.yml index a0baa80a..1d3335ff 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -1,6 +1,7 @@ name: pop-tools-dev channels: - conda-forge + - nodefaults dependencies: - bottleneck - codecov From a3b2ab265d6ba8fd4597a211d4fcca4b04c71109 Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Tue, 16 Mar 2021 08:52:01 -0600 Subject: [PATCH 5/5] Remove cust left and right margins --- docs/_static/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_static/css/style.css b/docs/_static/css/style.css index 2ea00d67..e1cff97f 100644 --- a/docs/_static/css/style.css +++ b/docs/_static/css/style.css @@ -1,9 +1,9 @@ /* Reduce left and right margins */ -.container, +/* .container, .container-lg, .container-md, .container-sm, .container-xl { max-width: 1600px !important; -} +} */