Skip to content

Commit

Permalink
Merge pull request #1 from tractometry/new_release
Browse files Browse the repository at this point in the history
New release
  • Loading branch information
arokem authored Oct 9, 2024
2 parents 7a73a78 + 3d3fb0f commit d4f977b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/docbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ jobs:
build:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.11"]

steps:
- name: Checkout repo
Expand All @@ -31,7 +30,7 @@ jobs:
cd docs
make html
- name: Upload docs
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: docs
path: docs/build/html
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,34 @@ jobs:
name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Set up Python 3.9
- uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v1
with:
python-version: 3.9
- name: Install pypa/build
python-version: 3.11
- name: Install pep517
run: >-
python -m
pip install
build
pep517
--user
- name: Build a binary wheel and a source tarball
run: >-
python -m
build
--sdist
--wheel
--outdir dist/
pep517.build
--source
--binary
--out-dir dist/
.
- name: Publish distribution 📦 to Test PyPI
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.test_pypi_password }}
repository_url: https://test.pypi.org/legacy/
repository-url: https://test.pypi.org/legacy/
- name: Publish distribution 📦 to PyPI
if: startsWith(github.event.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.pypi_password }}
password: ${{ secrets.pypi_password }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.9", "3.10", "3.11"]
nibabel-pre: [true, false]

steps:
Expand Down
2 changes: 1 addition & 1 deletion gpu_docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ENV LD_LIBRARY_PATH /opt/anaconda/lib:${LD_LIBRARY_PATH}
RUN pip install numpy scipy cython nibabel dipy tqdm fslpy

# clone pyAFQ GPUStreamlines
RUN git clone https://github.com/yeatmanlab/pyAFQ.git /opt/pyAFQ
RUN git clone https://github.com/tractometry/pyAFQ.git /opt/pyAFQ
RUN cd /opt/pyAFQ && git reset --hard ${COMMIT}
RUN git clone --recursive -b csaodf https://github.com/dipy/GPUStreamlines /opt/GPUStreamlines

Expand Down
2 changes: 1 addition & 1 deletion pyafq_docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM python:3.8
ARG COMMIT

# Install pyAFQ
RUN pip install --no-cache-dir git+https://github.com/yeatmanlab/pyAFQ.git@${COMMIT}
RUN pip install --no-cache-dir git+https://github.com/tractometry/pyAFQ.git@${COMMIT}
RUN pip install fslpy
RUN pyAFQ download

Expand Down

0 comments on commit d4f977b

Please sign in to comment.