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: 0 additions & 26 deletions .ci/actions_build_conda.sh

This file was deleted.

26 changes: 0 additions & 26 deletions .ci/actions_deploy_conda.sh

This file was deleted.

45 changes: 0 additions & 45 deletions .ci/travis_deploy_conda.sh

This file was deleted.

24 changes: 24 additions & 0 deletions .github/actions_build_conda.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/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

exit 0
24 changes: 24 additions & 0 deletions .github/actions_deploy_conda.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/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/enum_tools-*.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

exit 0
14 changes: 14 additions & 0 deletions .github/workflows/cleanup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file is managed by 'repo_helper'. Don't edit it directly.
---
name: Artefact Cleaner
on:
schedule:
- cron: 0 9 1 * *
jobs:
Clean:
runs-on: ubuntu-latest
steps:
- name: cleanup
uses: glassechidna/artifact-cleaner@v2
with:
minimumAge: 1000000.0
10 changes: 5 additions & 5 deletions .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 Expand Up @@ -143,13 +143,13 @@ jobs:

- name: Build Conda 📦
run: |
chmod +x .ci/actions_build_conda.sh
bash .ci/actions_build_conda.sh
chmod +x .github/actions_build_conda.sh
bash .github/actions_build_conda.sh

- name: Deploy Conda 🚀
if: startsWith(github.ref, 'refs/tags/')
run: |
chmod +x .ci/actions_deploy_conda.sh
bash .ci/actions_deploy_conda.sh
chmod +x .github/actions_deploy_conda.sh
bash .github/actions_deploy_conda.sh
env:
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
32 changes: 16 additions & 16 deletions .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@ known_third_party =
beautifulsoup4
bs4
coverage
coverage-pyver-pragma
domdf-python-tools
extras-require
coverage_pyver_pragma
domdf_python_tools
extras_require
github
html5lib
pygments
pytest
pytest-cov
pytest-randomly
pytest-regressions
pytest-rerunfailures
pytest-timeout
pytest_cov
pytest_randomly
pytest_regressions
pytest_rerunfailures
pytest_timeout
requests
sphinx
sphinx-autodoc-typehints
sphinx-notfound-page
sphinx-prompt
sphinx-rtd-theme
sphinx-tabs
sphinx-toolbox
sphinxcontrib-httpdomain
sphinx_autodoc_typehints
sphinx_notfound_page
sphinx_prompt
sphinx_rtd_theme
sphinx_tabs
sphinx_toolbox
sphinxcontrib_httpdomain
sphinxemoji
typing-extensions
typing_extensions
known_first_party = enum_tools
remove_redundant_aliases = True
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 @@ -37,7 +37,7 @@ Enum Tools
:alt: Docs Check Status

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

.. |actions_windows| image:: https://github.com/domdfcoding/enum_tools/workflows/Windows%20Tests/badge.svg
Expand Down
2 changes: 1 addition & 1 deletion doc-source/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sphinx-copybutton>=0.2.12
sphinx-notfound-page>=0.5
sphinx-prompt>=1.1.0
sphinx-tabs>=1.1.13
sphinx-toolbox>=1.7.3
sphinx-toolbox>=1.7.5
sphinxcontrib-httpdomain>=1.7.0
sphinxemoji>=0.1.6
toctree-plus>=0.0.4
3 changes: 0 additions & 3 deletions repo_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ python_versions:
- "3.9-dev"

# travis secure password for PyPI
travis_pypi_secure: "ccXgmg5Goemg2IFrw1F62mtnVmVVPpEVPCrPhAfuW4uEh9MgfluULgFjOZUaur9frgTwlFuXjv7Uyz66+IBH4m+W8z6vKaBq260fi+6Dues+BgyOvVvDmPm1+pE7rVxSWzDJgfEiRJjGo0CjrVmqvFIyamwJqojkR3AcNRtRZFFaH0P5gA1EcAQrfngn4IK6lxgYd0b6CrwZodyr/o7xDMpqikKcYJAiXLtQp7CFeo/NfRWIgzfhvquxpA81AZbeyVL4cciDLsmQHqib6yhHb8sGDGCo9tCUB0oWf7tFbS/diIFYqumqbdumxTl8p7u4NL7XJc6F8ySTQ0RsHk1/3U7z5hSGQDbhAsGdsBeEf4iM22M1CqJ8raFcZXaeF2DLqFdTHovsG0BNG5VWNsrgn2G+S60wPgiQQBZKtNrvIOVu1QGCCUdBUO1cpnrIk4g8ZB7P12uHDWVWUDF1xYhji/F1JEIZ1eVgmVWPKBbGe+n6WfQIxfRPy++xyNU2F0C4UnapkR894UW8LDfAFS1K5cZluco8ZYj0AQgR5mdQkCCfcWCIgabtTyrsPum2sFFFbQyWJ7ZEfUPX7cfu5qKJ4TmOFZGTEp7ii+jYhaSGfpsayV4wxIJD55n0RhsxcNk908dXKn78AWBVVjHqdfWKnCKF0Lc26G0g9OoNeRp74II="

# additional lines for MANIFEST.in
manifest_additional:
Expand Down Expand Up @@ -61,5 +60,3 @@ extra_sphinx_extensions:

sphinx_conf_epilogue:
- html_logo = "../enum_tools.png"

use_travis: false
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ packages = find:

[options.packages.find]
exclude =
doc-source
tests
tests.*
doc-source

[mypy]
python_version = 3.6
Expand Down
19 changes: 8 additions & 11 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,13 +27,6 @@ test = py36, py37, py38, py39-dev
qa = mypy, lint
cov = py36, coverage

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

[gh-actions]
python =
3.6: py36, build, mypy
Expand All @@ -53,9 +45,7 @@ commands =
python -m pytest --cov=enum_tools -r aR tests/ {posargs}

[testenv:docs]
setenv =
SHOW_TODOS = 1
PIP_USE_FEATURE = 2020-resolver
setenv = SHOW_TODOS = 1
basepython = python3.8
changedir = {toxinidir}/doc-source
extras = all
Expand Down Expand Up @@ -172,6 +162,13 @@ package = enum_tools
addopts = --color yes --durations 25
timeout = 300

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

[testenv:yapf]
basepython = python3.7
changedir = {toxinidir}
Expand Down