Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI #78

Merged
merged 5 commits into from
Mar 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
# Check for updates once a week
interval: 'weekly'
14 changes: 14 additions & 0 deletions .github/workflows/cancel-duplicate-runs.yaml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
with:
workflow_id: ${{ github.event.workflow.id }}
29 changes: 29 additions & 0 deletions .github/workflows/ci-upstream-dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
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,nodefaults
channel-priority: strict
mamba-version: '*'
activate-environment: pop-tools-dev
auto-update-conda: false
python-version: 3.8
environment-file: ci/environment-upstream-dev.yml
- name: Install pop-tools
run: |
python -m pip install . --no-deps
conda list
- name: Run Tests
run: |
python -m pytest --cov=./ --cov-report=xml --verbose
38 changes: 4 additions & 34 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -25,17 +21,17 @@ 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
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
Expand All @@ -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
1 change: 1 addition & 0 deletions ci/environment-upstream-dev.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: pop-tools-dev
channels:
- conda-forge
- nodefaults
dependencies:
- bottleneck
- codecov
Expand Down
1 change: 1 addition & 0 deletions ci/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: pop-tools-dev
channels:
- conda-forge
- nodefaults
dependencies:
- bottleneck
- codecov
Expand Down
4 changes: 2 additions & 2 deletions docs/_static/css/style.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* Reduce left and right margins */

.container,
/* .container,
.container-lg,
.container-md,
.container-sm,
.container-xl {
max-width: 1600px !important;
}
} */