Skip to content

Commit

Permalink
Merge pull request #38 from XingerTang/devel
Browse files Browse the repository at this point in the history
Update actions versions
  • Loading branch information
gregorgorjanc authored Sep 5, 2024
2 parents 0a9b5fe + 51f3c00 commit 0c185de
Show file tree
Hide file tree
Showing 16 changed files with 1,627 additions and 1,270 deletions.
8 changes: 8 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[flake8]
# Black by its default setting the maximum length to 88
max-line-length = 88
extend-ignore =
# also the Black's default, whitespace before ':'
E203,
# this is for the line length, all the lines too long are comments now
E501
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
environment: release

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand All @@ -31,14 +31,14 @@ jobs:
- name: Build SDist and wheel
run: python3 -m build

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: dist/*

- name: Check metadata
run: pipx run twine check dist/*

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ jobs:
- name: Build SDist and wheel
run: python3 -m build

- name: Install AlphaPeel
run: pip install dist/AlphaPeel-1.1.3-py3-none-any.whl
- name: Install AlphaImpute2
run: pip install dist/AlphaImpute2-0.0.3-py3-none-any.whl

- name: Install pytest
run: |
pip install pytest
pip install pytest-benchmark
# - name: Install pytest
# run: |
# pip install pytest
# pip install pytest-benchmark

- name: Run pytest
run: |
pytest
# - name: Run pytest
# run: |
# pytest
9 changes: 9 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
repos:
- repo: https://github.com/psf/black
rev: 23.7.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
21 changes: 8 additions & 13 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,20 @@

# -- Project information -----------------------------------------------------

project = 'AlphaImpute2'
copyright = '2020, Andrew Whalen'
author = 'Andrew Whalen'
project = "AlphaImpute2"
copyright = "2020, Andrew Whalen"
author = "Andrew Whalen"


# -- General configuration ---------------------------------------------------

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
]
extensions = []

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand All @@ -44,29 +43,25 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'alabaster'
html_theme = "alabaster"

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ["_static"]

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',

# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
'extraclassoptions': 'openany,oneside'

"extraclassoptions": "openany,oneside"
}
49 changes: 0 additions & 49 deletions setup.py

This file was deleted.

5 changes: 4 additions & 1 deletion src/alphaimpute2-script.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
from alphaimpute2 import alphaimpute2


def main():
alphaimpute2.main()


if __name__ == "__main__":
main()
main()
Loading

0 comments on commit 0c185de

Please sign in to comment.