Skip to content

Commit

Permalink
Merge branch 'master' into i_forge
Browse files Browse the repository at this point in the history
  • Loading branch information
sellth committed Oct 27, 2023
2 parents 5d27ab5 + 1009797 commit d0f7b4f
Show file tree
Hide file tree
Showing 21 changed files with 1,247 additions and 671 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
altamisa/_version.py export-subst
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
strategy:
matrix:
python-version:
- 3.6
- 3.7
- 3.8
- 3.9
- '3.8'
- '3.9'
- '3.10'
- '3.11'

steps:
- name: Install Python via conda.
Expand Down Expand Up @@ -43,7 +43,6 @@ jobs:
coverage-reports: coverage.xml
if: ${{ matrix.python-version == '3.7' }}
- name: Check style with black
run: black --check --line-length 100 .
if: ${{ matrix.python-version < '3.9' }}
run: make black-check
- name: Check style with flake8
run: flake8 .
22 changes: 22 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.11"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# We recommend specifying your dependencies to enable reproducible builds:
# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
install:
- requirements: requirements/develop.txt
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 2.7, 3.4, 3.5 and 3.6, and for PyPy. Check
3. The pull request should work for Python 3.8, 3.9, 3.10, and 3.11 as well as for PyPy. Check
https://travis-ci.org/bihealth/altamisa/pull_requests
and make sure that the tests pass for all supported Python versions.

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
default: black flake8

black:
black -l 100 .
black -l 100 --exclude "versioneer.py|_version.py" .

black-check:
black -l 100 --check .
black -l 100 --exclude "versioneer.py|_version.py" --check .

flake8:
flake8 .
Expand Down
4 changes: 4 additions & 0 deletions altamisa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@

__version__ = get_versions()["version"]
del get_versions

from . import _version

__version__ = _version.get_versions()["version"]
Loading

0 comments on commit d0f7b4f

Please sign in to comment.