Skip to content
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
26 changes: 26 additions & 0 deletions .github/actions_build_conda.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash
# This file is managed by 'repo_helper'. Don't edit it directly.

set -e -x

python -m repo_helper make-recipe || exit 1

# Switch to miniconda
source "/home/runner/miniconda/etc/profile.d/conda.sh"
hash -r
conda activate base
conda config --set always_yes yes --set changeps1 no
conda update -q conda
conda install conda-build
conda install anaconda-client
conda info -a

conda config --add channels domdfcoding || exit 1

conda config --add channels conda-forge || exit 1

conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing

fi

exit 0
26 changes: 26 additions & 0 deletions .github/actions_deploy_conda.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash
# This file is managed by 'repo_helper'. Don't edit it directly.

set -e -x

# Switch to miniconda
source "/home/runner/miniconda/etc/profile.d/conda.sh"
hash -r
conda activate base
conda config --set always_yes yes --set changeps1 no
conda update -q conda
conda install anaconda-client
conda info -a

for f in conda/dist/noarch/consolekit-*.tar.bz2; do
[ -e "$f" ] || continue
echo "$f"
conda install "$f" || exit 1
echo "Deploying to Anaconda.org..."
anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
echo "Successfully deployed to Anaconda.org."
done

fi

exit 0
2 changes: 1 addition & 1 deletion .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
shopt -s globstar
python -m coverage combine coverage/**/.coverage

- name: "Upload Combined Coverage Aretfact"
- name: "Upload Combined Coverage Artefact"
uses: actions/upload-artifact@v2
with:
name: "combined-coverage"
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ repos:
- id: forbid-crlf

- repo: https://github.com/domdfcoding/yapf-isort
rev: v0.5.2
rev: v0.5.4
hooks:
- id: yapf-isort
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$

- repo: https://github.com/domdfcoding/dep_checker
rev: v0.3.1
rev: v0.4.1
hooks:
- id: dep_checker
args:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Spun out from `repo_helper <https://github.com/domdfcoding/repo_helper>`_. Needs
:alt: Docs Check Status

.. |travis| image:: https://github.com/domdfcoding/consolekit/workflows/Linux%20Tests/badge.svg
:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%Linux+Tests%22
:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22Linux+Tests%22
:alt: Linux Test Status

.. |actions_windows| image:: https://github.com/domdfcoding/consolekit/workflows/Windows%20Tests/badge.svg
Expand Down
1 change: 0 additions & 1 deletion repo_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ classifiers:
- 'Intended Audience :: Developers'
- 'Topic :: Software Development :: Libraries :: Python Modules'

travis_pypi_secure: "GfAQOh0efX8gPqiDVvVL+XPn2IxXio+EWvlAdu6sCPayTAf/705TV5O/q6RdAFsB+ceHF+YbZIgao+vvm9F73cEBZhnrQuF3KFEP1MtVXsg/aerCBzIH7jG3lchSajovrBgB/Xeehk6Qszv9h6xMtj/gXTQ1FBXPkMlyLSmV/LqqZWfLIjnSbE+DZP78XYjdcNjZAUEtyPHvl1b4N+a3s5tXjppscoerlFxeNt5jOr+MU3w7S7MYHbinY51CwEo2D+Z9yuEZ0cNM/rIMk45BiQZaycR4Y5ZYrw+qCfcweiRrEsl9am3pVvfY3wn/RylzrwPPRfxvkF/ekgWYaX6NWLgUC5jr7+pH6y80Kz58d0uCV2dZWmCqUPJJ68EHglP2VYv+3muGGxBDVA68ony2jDIyUKXvW6tz2AlHTw+9JjXNUOkT89iU7Gpl1gH+A4Ng5qBrQW3RZivwWFnxuvZHrFi4ifaKtMNpTV0ZjNzrusqL/B3BGEcUJnAEajK+myxqsjQLLf0QJrJW4XoDgfLRxrPqe7zUgXO79mMBTkklBnl6EcBCCnxPpku7vASoO3Bmy2/PzhcVYprSY9SGmHQyalXMF1NeEXXRLjYRqFK1hqbB04Fg2EQqvBePU4u8FcjAu2ktIoow890UCYybhVChoAeipi1Pn8zAxG9+HopsYV0="

conda_channels:
- domdfcoding
Expand Down
19 changes: 9 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# You may add new sections, but any changes made to the following sections will be lost:
# * tox
# * envlists
# * travis
# * gh-actions
# * testenv
# * testenv:docs
Expand All @@ -28,15 +27,6 @@ test = py36, py37, py38, py39, py310-dev, pypy3
qa = mypy, lint
cov = py36, coverage

[travis]
python =
3.6: py36, build, mypy
3.7: py37, build
3.8: py38, build
3.9: py39, build
3.10-dev: py310-dev, build
pypy3: pypy3, build

[gh-actions]
python =
3.6: py36, build, mypy
Expand Down Expand Up @@ -172,3 +162,12 @@ package = consolekit
[pytest]
addopts = --color yes --durations 25
timeout = 300

[travis]
python =
3.6: py36, build, mypy
3.7: py37, build
3.8: py38, build
3.9: py39, build
3.10-dev: py310-dev, build
pypy3: pypy3, build