Skip to content

Commit

Permalink
Updated config files.
Browse files Browse the repository at this point in the history
  • Loading branch information
domdfcoding committed Nov 25, 2020
1 parent 8041472 commit 2529627
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 105 deletions.
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.

28 changes: 13 additions & 15 deletions .github/actions_build_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,22 @@

set -e -x

python -m repo_helper make-recipe || exit 1
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
# 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 domdfcoding || exit 1

conda config --add channels conda-forge || 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
conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing

exit 0
34 changes: 16 additions & 18 deletions .github/actions_deploy_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,22 @@

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
# 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/apeye-*.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
for f in conda/dist/noarch/apeye-*.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
2 changes: 0 additions & 2 deletions .github/workflows/conda_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ jobs:
name: "Conda"
runs-on: ubuntu-latest

strategy:

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
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 }}
16 changes: 8 additions & 8 deletions .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ remove_redundant_aliases = True
default_section = THIRDPARTY
known_third_party =
appdirs
backports-datetime-fromisoformat
backports_datetime_fromisoformat
cachecontrol
cherrypy
coverage
coverage-pyver-pragma
domdf-python-tools
coverage_pyver_pragma
domdf_python_tools
github
lockfile
pytest
pytest-cov
pytest-httpserver
pytest-randomly
pytest-rerunfailures
pytest-timeout
pytest_cov
pytest_httpserver
pytest_randomly
pytest_rerunfailures
pytest_timeout
pyyaml
requests
slumber
Expand Down
2 changes: 1 addition & 1 deletion doc-source/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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
tabulate>=0.8.7
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ classifiers =
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: Implementation :: CPython
Topic :: Software Development :: Libraries :: Python Modules
Typing :: Typed
Expand All @@ -43,9 +43,9 @@ packages = find:

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

[mypy]
python_version = 3.6
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ commands =
python -m pytest --cov=apeye -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
deps =
Expand Down

0 comments on commit 2529627

Please sign in to comment.