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
22 changes: 0 additions & 22 deletions .github/actions_build_conda.sh

This file was deleted.

23 changes: 0 additions & 23 deletions .github/actions_deploy_conda.sh

This file was deleted.

28 changes: 28 additions & 0 deletions .github/milestones.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env python

# stdlib
import os
import sys

# 3rd party
from github3 import GitHub
from github3.repos import Repository
from packaging.version import InvalidVersion, Version

latest_tag = os.environ["GITHUB_REF_NAME"]

try:
current_version = Version(latest_tag)
except InvalidVersion:
sys.exit()

gh: GitHub = GitHub(token=os.environ["GITHUB_TOKEN"])
repo: Repository = gh.repository(*os.environ["GITHUB_REPOSITORY"].split('/', 1))

for milestone in repo.milestones(state="open"):
try:
milestone_version = Version(milestone.title)
except InvalidVersion:
continue
if milestone_version == current_version:
sys.exit(not milestone.update(state="closed"))
14 changes: 0 additions & 14 deletions .github/workflows/cleanup.yml

This file was deleted.

20 changes: 14 additions & 6 deletions .github/workflows/conda_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ jobs:
tests:
name: "Conda"
runs-on: ubuntu-18.04
defaults:
run:
shell: bash -l {0}

steps:
- name: Checkout 🛎️
Expand All @@ -23,16 +26,20 @@ jobs:
with:
python-version: "3.8"

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: env
conda-build-version: 3.21.0

- name: Install dependencies 🔧
run: |
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade whey-conda
python -m pip install --upgrade "whey-conda" "whey"
# $CONDA is an environment variable pointing to the root of the miniconda directory
$CONDA/bin/conda update -q conda
$CONDA/bin/conda install conda-build=3.21.0

$CONDA/bin/conda update -n base conda
$CONDA/bin/conda config --add channels conda-forge
$CONDA/bin/conda config --add channels domdfcoding

Expand All @@ -53,5 +60,6 @@ jobs:
- name: "Run Tests"
run: |
rm -rf sphinx_pyproject
$CONDA/bin/pip install -r tests/requirements.txt
$CONDA/bin/pytest tests/
$CONDA/bin/conda install pytest coincidence || exit 1
pip install -r tests/requirements.txt
pytest tests/
2 changes: 1 addition & 1 deletion .github/workflows/docs_test_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v1"
uses: "actions/checkout@v2"

- name: Check for changed files
uses: dorny/paths-filter@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:

permissions:
actions: write
issues: write
contents: read

jobs:
Expand Down
63 changes: 51 additions & 12 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:

permissions:
actions: write
issues: write
contents: read

jobs:
Expand Down Expand Up @@ -102,21 +103,26 @@ jobs:
path: coverage

- name: Display structure of downloaded files
id: show
run: ls -R
working-directory: coverage
continue-on-error: true

- name: Combine Coverage 👷
if: ${{ steps.show.outcome != 'failure' }}
run: |
shopt -s globstar
python -m coverage combine coverage/**/.coverage

- name: "Upload Combined Coverage Artefact 🚀"
if: ${{ steps.show.outcome != 'failure' }}
uses: actions/upload-artifact@v2
with:
name: "combined-coverage"
path: .coverage

- name: "Upload Combined Coverage to Coveralls"
if: ${{ steps.show.outcome != 'failure' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand All @@ -133,21 +139,21 @@ jobs:

- name: Setup Python 🐍
uses: "actions/setup-python@v2"
if: startsWith(github.ref, 'refs/tags/')
with:
python-version: 3.8
if: startsWith(github.ref, 'refs/tags/')

- name: Install dependencies 🔧
if: startsWith(github.ref, 'refs/tags/')
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox
if: startsWith(github.ref, 'refs/tags/')

- name: Build distributions 📦
if: startsWith(github.ref, 'refs/tags/')
run: |
tox -e build

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

- name: Upload distribution to PyPI 🚀
if: startsWith(github.ref, 'refs/tags/')
Expand All @@ -157,6 +163,15 @@ jobs:
password: ${{ secrets.PYPI_TOKEN }}
skip_existing: true

- name: Close milestone 🚪
if: startsWith(github.ref, 'refs/tags/')
run: |
python -m pip install --upgrade github3.py packaging
python .github/milestones.py
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}



Conda:
needs: deploy
Expand All @@ -171,22 +186,46 @@ jobs:
with:
python-version: 3.8

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: env
conda-build-version: 3.21.0

- name: Install dependencies 🔧
run: |
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade mkrecipe
python -m pip install --upgrade "mkrecipe" "whey"
# $CONDA is an environment variable pointing to the root of the miniconda directory
$CONDA/bin/conda config --set always_yes yes --set changeps1 no
$CONDA/bin/conda update -n base conda
$CONDA/bin/conda info -a
$CONDA/bin/conda config --add channels conda-forge
$CONDA/bin/conda config --add channels domdfcoding

wget https://repo.anaconda.com/miniconda/Miniconda3-py38_4.10.3-Linux-x86_64.sh -O miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
$CONDA/bin/conda config --remove channels defaults

- name: Build Conda 📦
- name: Build Conda Package 📦
run: |
chmod +x .github/actions_build_conda.sh
bash .github/actions_build_conda.sh
python -m mkrecipe --type wheel || exit 1
$CONDA/bin/conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist

- name: Deploy Conda 🚀
- name: Deploy Conda Package 🚀
if: startsWith(github.ref, 'refs/tags/')
run: |
chmod +x .github/actions_deploy_conda.sh
bash .github/actions_deploy_conda.sh
$CONDA/bin/conda config --set always_yes yes --set changeps1 no
$CONDA/bin/conda install anaconda-client
$CONDA/bin/conda info -a

for f in conda/dist/noarch/sphinx-pyproject-*.tar.bz2; do
[ -e "$f" ] || continue
echo "$f"
conda install "$f" || exit 1
echo "Deploying to Anaconda.org..."
$CONDA/bin/anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
echo "Successfully deployed to Anaconda.org."
done
env:
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
1 change: 1 addition & 0 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:

permissions:
actions: write
issues: write
contents: read

jobs:
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ repos:
- id: end-of-file-fixer

- repo: https://github.com/domdfcoding/pre-commit-hooks
rev: v0.2.1
rev: v0.3.0
hooks:
- id: requirements-txt-sorter
args:
Expand All @@ -40,7 +40,7 @@ repos:
- id: bind-requirements

- repo: https://github.com/domdfcoding/flake8-dunder-all
rev: v0.1.7
rev: v0.1.8
hooks:
- id: ensure-dunder-all
files: ^sphinx_pyproject/.*\.py$
Expand All @@ -67,13 +67,13 @@ repos:
- --keep-runtime-typing

- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.10
rev: v1.1.11
hooks:
- id: remove-crlf
- id: forbid-crlf

- repo: https://github.com/python-formate/snippet-fmt
rev: v0.1.3
rev: v0.1.4
hooks:
- id: snippet-fmt

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ sphinx-pyproject
:target: https://github.com/sphinx-toolbox/sphinx-pyproject/commit/master
:alt: GitHub last commit

.. |maintained| image:: https://img.shields.io/maintenance/yes/2021
.. |maintained| image:: https://img.shields.io/maintenance/yes/2022
:alt: Maintenance

.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/sphinx-pyproject
Expand Down
16 changes: 0 additions & 16 deletions __pkginfo__.py

This file was deleted.

2 changes: 1 addition & 1 deletion doc-source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ sphinx-pyproject
:last-commit:
:alt: GitHub last commit

.. |maintained| maintained-shield:: 2021
.. |maintained| maintained-shield:: 2022
:alt: Maintenance

.. |pypi-downloads| pypi-shield::
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ base-classifiers = [
"Topic :: Utilities",
"Typing :: Typed",
]
python-versions = [ "3.6", "3.7", "3.8", "3.9",]
python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10",]
python-implementations = [ "CPython", "PyPy",]
platforms = [ "Windows", "macOS", "Linux",]
license-key = "MIT"
Expand Down
Loading