Skip to content

Commit

Permalink
Requirements and workflow updates (#40)
Browse files Browse the repository at this point in the history
* Update dev requirements

* Update requirements

* Fix black version

* Change to beta version

* Update CI environment

* Update when CI runs

* Docs badge
  • Loading branch information
mmuckley authored Nov 8, 2021
1 parent 807ccb2 commit 9746689
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 14 deletions.
43 changes: 40 additions & 3 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,48 @@

name: Build and test

on: [push, pull_request]
on:
workflow_dispatch:
pull_request:
push:
branches:
- main

jobs:
build-and-test:
runs-on: ubuntu-latest
build:
name: Build
strategy:
max-parallel: 4
matrix:
platform: [ubuntu-latest]
python-version: [3.7, 3.8]

runs-on: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install
run: |
python -m pip install --upgrade pip
pip install --upgrade wheel
pip install -e .
- name: Test Import
run: |
python -c 'import torchkbnufft'
lint-and-test:
name: Lint and Test
strategy:
max-parallel: 4
matrix:
platform: [ubuntu-latest]
python-version: [3.7, 3.8]

runs-on: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# torchkbnufft

[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
![CI Badge](https://github.com/mmuckley/torchkbnufft/workflows/Build%20and%20test/badge.svg?branch=master)
![CI Badge](https://github.com/mmuckley/torchkbnufft/workflows/Build%20and%20test/badge.svg?branch=master) [![Documentation Status](https://readthedocs.org/projects/torchkbnufft/badge/?version=stable)](https://torchkbnufft.readthedocs.io/en/stable/?badge=latest)

[Documentation](https://torchkbnufft.readthedocs.io) | [GitHub](https://github.com/mmuckley/torchkbnufft) | [Notebook Examples](notebooks)

Expand Down
10 changes: 5 additions & 5 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-r requirements.txt
black==20.8b1
pytest==6.2.3
flake8==3.9.0
mypy==0.812
pillow==8.3.2
black==21.10b0
pytest==6.2.5
flake8==4.0.1
mypy==0.910
pillow==8.4.0
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
torch==1.8.1
numpy==1.20.2
scipy==1.6.2
torch==1.10.0
numpy==1.21.2
scipy==1.7.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import torchkbnufft # noqa: E402

install_requires = ["torch>=1.8", "numpy", "scipy"]
install_requires = ["torch>=1.10", "numpy", "scipy"]

# https://packaging.python.org/discussions/install-requires-vs-requirements
setup(
Expand Down
2 changes: 1 addition & 1 deletion torchkbnufft/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Package info"""

__version__ = "1.2.0.post3"
__version__ = "1.3.0b20211108"
__author__ = "Matthew Muckley"
__author_email__ = "[email protected]"
__license__ = "MIT"
Expand Down

0 comments on commit 9746689

Please sign in to comment.