Skip to content

Commit

Permalink
Merge branch 'release/0.4.0' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
felixhekhorn committed Nov 5, 2020
2 parents ef4a40d + bb72fde commit b8882b5
Show file tree
Hide file tree
Showing 229 changed files with 8,769 additions and 3,706 deletions.
17 changes: 17 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 300
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 65
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
8 changes: 4 additions & 4 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
APFEL:
runs-on: ubuntu-latest
strategy:
# max-parallel: 2
max-parallel: 2
matrix:
python-version: [3.8]
python-version: [3.8, 3.9]
fail-fast: false

steps:
- name: Configure git-lfs to ignore most files
run: |
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Test yadism
run: |
# run tests
pytest -m commit_check benchmarks/benchmark_against_apfel.py
pytest -m commit_check benchmarks/runners/benchmark_against_*.py
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
Expand Down
56 changes: 47 additions & 9 deletions .github/workflows/pub_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,35 @@ on:
push:
branches:
- master
- develop
tags:
- "*"

jobs:
deploy-ghpages:
runs-on: ubuntu-latest
strategy:
# max-parallel: 2
#max-parallel: 3
matrix:
python-version: [3.7]
python-version: [3.8]
fail-fast: false

steps:
- name: Checkout 🛎️
uses: actions/checkout@v2
with:
persist-credentials: false
token: ${{ secrets.ALE_DIS_PAT }}
token: ${{ github.token }}
submodules: "true"
- name: Set up Node 🧶
uses: actions/setup-node@v2-beta
with:
node-version: "12"
- name: Set up Python ${{ matrix.python-version }} 🐍
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install package and build docs 📦
- name: Install package 📦
run: |
# install pip
python -m pip install --upgrade pip
Expand All @@ -35,11 +42,42 @@ jobs:
run: |
pip install -r doc_requirements.txt
sudo apt-get install graphviz
cd docs/sphinx/
cd docs/home-page
yarn
make
cd ../sphinx/
make html
- name: Save files 💾
run: |
cd docs
mv sphinx/build/html ~
mv home-page/build ~/home-page
mv _assets ~
- name: Prepare deployment ⌛
run: |
# fetch all branches
git fetch --depth=1
git checkout gh-pages
github_ref="${{ github.ref }}"
dest_dir=$(echo $github_ref | rev | cut -d "/" -f 1 | rev)
if [ "$dest_dir" = "master" ]; then
dest_dir="stable"
fi
rm -rf js
mv ~/home-page/* .
rm -rf _assets
mv ~/_assets .
rm -rf $dest_dir
mv ~/html $dest_dir
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@releases/v3
#uses: JamesIves/github-pages-deploy-action@releases/v3
#with:
#ACCESS_TOKEN: ${{ github.token }}
#BRANCH: gh-pages # The branch the action should deploy to.
#FOLDER: "docs/sphinx/build/html" # The folder the action should deploy.
uses: EndBug/add-and-commit@v4.4.0
with:
ACCESS_TOKEN: ${{ secrets.ALE_DIS_PAT }}
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: "docs/sphinx/build/html" # The folder the action should deploy.
message: "Currently deploying: ${{ github.ref }}"
ref: "gh-pages"
env:
GITHUB_TOKEN: ${{ github.token }}
37 changes: 37 additions & 0 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: deploy

on:
push:
tags:
- "*"

jobs:
build-n-publish:
name: Build and publish Python 🐍 distributions 📦 to PyPI

strategy:
matrix:
os: [ubuntu-latest]
python-version: [3.8]

#if: startsWith(github.event.ref, 'refs/tags')

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@master
- name: Setup Python 🐍
uses: actions/setup-python@master
with:
python-version: ${{ matrix.python-version }}
- name: Install package
run: |
pip install -e .
- name: Package the distribution
run: |
# package the pure python wheel
pip wheel . -w dist --no-deps
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.PYPI_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
regression:
runs-on: ubuntu-latest
strategy:
# max-parallel: 2
max-parallel: 3
matrix:
python-version: [3.7, 3.8]
python-version: [3.7, 3.8, 3.9]
fail-fast: false

steps:
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ jobs:
unittests:
runs-on: ubuntu-latest
strategy:
# max-parallel: 2
max-parallel: 3
matrix:
python-version: [3.7, 3.8]
python-version: [3.7, 3.8, 3.9]
fail-fast: false

steps:
# checkout the repo on the github runner
# with fetch-depth = 0 all the repo is checked out with full-history
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }} 🐍
uses: actions/setup-python@v1
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# ignore version
src/yadism/version.py

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
# run arbitrary code
extension-pkg-whitelist=numpy
extension-pkg-whitelist=numpy,lhapdf,QCDNUM,scipy.special,rich

# Add files or directories to the blacklist. They should be base names, not
# paths.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<a href="https://n3pdf.github.io/yadism/"><img alt="Yadism" src="docs/logo/logo.png" width=600></a>
<a href="https://n3pdf.github.io/yadism/"><img alt="Yadism" src="docs/_assets/logo/logo.png" width=600></a>
</p>

<p align="center">
Expand Down
109 changes: 0 additions & 109 deletions benchmarks/benchmark_against_apfel.py

This file was deleted.

Loading

0 comments on commit b8882b5

Please sign in to comment.