Skip to content

Commit

Permalink
ci: upgrade developer dependencies (#71)
Browse files Browse the repository at this point in the history
* ci: equalize dev environment with expertsystem
* fix: define markdown anchor master-branch

Co-authored-by: GitHub <[email protected]>
  • Loading branch information
redeboer and web-flow authored Feb 22, 2021
1 parent 5530bc4 commit b980f59
Show file tree
Hide file tree
Showing 23 changed files with 104 additions and 120 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cspell:ignore noreply prereleased pypa reqs
# cspell:ignore noreply prereleased

name: CD

Expand All @@ -13,9 +13,6 @@ jobs:
name: Push to stable branch
if: startsWith(github.ref, 'refs/tags')
runs-on: ubuntu-20.04
needs:
- documentation
- style
steps:
- uses: actions/checkout@master
- name: Push to stable branch
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,10 @@ on:
branches: [master]
pull_request:
branches: [master]
types:
- opened
- synchronize
- reopened
- ready_for_review

jobs:
documentation:
name: Build documentation and run notebooks
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
Expand All @@ -36,7 +30,6 @@ jobs:

style:
name: Style checks
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ on:
branches: [master]
pull_request:
branches: [master]
types:
- opened
- synchronize
- reopened
- ready_for_review
workflow_dispatch:

jobs:
check_links:
name: Check external links
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- master
workflow_dispatch:

jobs:
update_release_draft:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/requirements-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ name: Requirements (scheduled)
on:
schedule:
- cron: "0 2 * * 1"
workflow_dispatch:

jobs:
upgrade:
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/requirements-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@ name: Requirements (PR)
on:
pull_request:
branches: [master]
types:
- opened
- synchronize
- reopened
- ready_for_review

jobs:
upgrade:
name: Upgrade requirement files
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
strategy:
matrix:
Expand Down Expand Up @@ -62,7 +56,6 @@ jobs:

push:
name: Push changes
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
needs:
- upgrade
Expand Down
10 changes: 10 additions & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
# pylint --generate-rcfile > .pylintrc_new
# and compare the output

[BASIC]
good-names=
i,
j,
k,
q,
x,
_,

[VARIABLES]
init-import=yes

Expand All @@ -13,6 +22,7 @@ disable=
C0330, # https://github.com/psf/black/issues/48
RST203, # unexpected indentation
RST301, # related to google style docstring
R0801, # similar lines # https://github.com/PyCQA/pylint/issues/214
logging-fstring-interpolation,
not-callable,
unused-import, # https://www.flake8rules.com/rules/F401
Expand Down
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = {
2,
"always",
[
"adr",
"build",
"ci",
"chore",
Expand Down
10 changes: 6 additions & 4 deletions docs/develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,8 @@ The documentation of the `stable` branch is also the default view
{ref}`you see on Read the Docs <develop:Documentation>` (RTD). See e.g.
[expertsystem.rtfd.io/en/stable](https://expertsystem.rtfd.io/en/stable).

(master-branch)=

#### `master` branch

Represents the upcoming release of the package. This branch is not guaranteed
Expand Down Expand Up @@ -620,10 +622,10 @@ python3 -m pip install git+https://github.com/ComPWA/expertsystem@epic/some-titl

#### Feature branches

The {ref}`develop:master branch` and {ref}`develop:epic branches` can be
updated through pull requests. It is best to create such a pull request from a
separate branch, which does not have any CI or code review restrictions. We
call this a "feature branch".
The {ref}`master-branch` and {ref}`develop:epic branches` can be updated
through pull requests. It is best to create such a pull request from a separate
branch, which does not have any CI or code review restrictions. We call this a
"feature branch".

### Commit conventions

Expand Down
2 changes: 1 addition & 1 deletion labels.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Something isn't working"
[Epic]
color = "3E4B9E"
name = "Epic"
description = ""
description = "Collection of issues, managed by ZenHub"

["⚠️ Interface"]
color = "BFDADC"
Expand Down
24 changes: 12 additions & 12 deletions reqs/3.6/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ alabaster==0.7.12
anyio==2.1.0
appdirs==1.4.4
argon2-cffi==20.1.0
astroid==2.4.2
astroid==2.5.0
async-generator==1.10
attrs==20.3.0
babel==2.9.0
Expand Down Expand Up @@ -40,13 +40,13 @@ flake8==3.8.4
gitdb==4.0.5
gitpython==3.1.13
graphviz==0.16
identify==1.5.13
identify==1.5.14
idna==2.10
imagesize==1.2.0
immutables==0.15
importlib-metadata==3.4.0
importlib-resources==3.0.0
ipykernel==5.4.3
ipykernel==5.5.0
ipython-genutils==0.2.0
ipython==7.16.1
ipywidgets==7.6.3
Expand All @@ -59,17 +59,17 @@ jupyter-cache==0.4.2
jupyter-client==6.1.11
jupyter-console==6.2.0
jupyter-core==4.7.1
jupyter-server==1.3.0
jupyter-server==1.4.0
jupyter-sphinx==0.3.1
jupyter==1.0.0
jupyterlab-code-formatter==1.4.4
jupyterlab-server==2.2.0
jupyterlab-server==2.3.0
jupyterlab-widgets==1.0.0
jupyterlab==3.0.7
jupyterlab==3.0.8
kiwisolver==1.3.1
labels==20.1.0
latexcodec==2.0.1
lazy-object-proxy==1.4.3
lazy-object-proxy==1.5.2
livereload==2.6.3
markdown-it-py==0.6.2
markupsafe==1.1.1
Expand All @@ -79,9 +79,9 @@ mdit-py-plugins==0.2.5
mistune==0.8.4
mpmath==1.2.1
mypy-extensions==0.4.3
mypy==0.800
mypy==0.812
myst-nb==0.11.1
myst-parser==0.13.3
myst-parser==0.13.5
nbclassic==0.2.6
nbclient==0.5.2
nbconvert==5.6.1
Expand Down Expand Up @@ -116,7 +116,7 @@ pydeps==1.9.13
pydocstyle==5.1.1
pyflakes==2.2.0
pygments==2.8.0
pylint==2.6.0
pylint==2.7.0
pyparsing==2.4.7
pyrsistent==0.17.3
python-dateutil==2.8.1
Expand All @@ -142,7 +142,7 @@ sphinx-math-dollar==1.2
sphinx-panels==0.5.2
sphinx-thebe==0.0.8
sphinx-togglebutton==0.2.3
sphinx==3.5.0
sphinx==3.5.1
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-bibtex==2.1.4
sphinxcontrib-devhelp==1.0.2
Expand All @@ -157,7 +157,7 @@ terminado==0.9.2
testpath==0.4.4
toml==0.10.2
tornado==6.1
tox==3.21.4
tox==3.22.0
traitlets==4.3.3
typed-ast==1.4.2
typing-extensions==3.7.4.3
Expand Down
6 changes: 3 additions & 3 deletions reqs/3.6/requirements-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ idna==2.10
imagesize==1.2.0
importlib-metadata==3.4.0
importlib-resources==3.0.0
ipykernel==5.4.3
ipykernel==5.5.0
ipython-genutils==0.2.0
ipython==7.16.1
ipywidgets==7.6.3
Expand All @@ -52,7 +52,7 @@ mdit-py-plugins==0.2.5
mistune==0.8.4
mpmath==1.2.1
myst-nb==0.11.1
myst-parser==0.13.3
myst-parser==0.13.5
nbclient==0.5.2
nbconvert==5.6.1
nbdime==2.1.0
Expand Down Expand Up @@ -94,7 +94,7 @@ sphinx-math-dollar==1.2
sphinx-panels==0.5.2
sphinx-thebe==0.0.8
sphinx-togglebutton==0.2.3
sphinx==3.5.0
sphinx==3.5.1
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-bibtex==2.1.4
sphinxcontrib-devhelp==1.0.2
Expand Down
10 changes: 5 additions & 5 deletions reqs/3.6/requirements-sty.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# pip-compile --no-annotate --output-file=reqs/3.6/requirements-sty.txt reqs/3.6/requirements-sty.in
#
appdirs==1.4.4
astroid==2.4.2
astroid==2.5.0
attrs==20.3.0
black==20.8b1
cfgv==3.2.0
Expand All @@ -22,19 +22,19 @@ flake8-builtins==1.5.3
flake8-polyfill==1.0.2
flake8-rst-docstrings==0.0.14
flake8==3.8.4
identify==1.5.13
identify==1.5.14
importlib-metadata==3.4.0
importlib-resources==3.0.0
ipython-genutils==0.2.0
isort==5.7.0
jsonschema==3.2.0
jupyter-core==4.7.1
kiwisolver==1.3.1
lazy-object-proxy==1.4.3
lazy-object-proxy==1.5.2
matplotlib==3.3.4
mccabe==0.6.1
mypy-extensions==0.4.3
mypy==0.800
mypy==0.812
nbformat==5.1.2
nbstripout==0.3.9
nodeenv==1.5.0
Expand All @@ -46,7 +46,7 @@ pre-commit==2.10.1
pycodestyle==2.6.0
pydocstyle==5.1.1
pyflakes==2.2.0
pylint==2.6.0
pylint==2.7.0
pyparsing==2.4.7
pyrsistent==0.17.3
python-dateutil==2.8.1
Expand Down
Loading

0 comments on commit b980f59

Please sign in to comment.