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
3 changes: 1 addition & 2 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ jobs:
sudo apt-get update
sudo apt-get install -y inkscape --no-install-recommends
pip install --upgrade pip
pip install wheel setuptools numpy cython
# force using latest nibabel
pip install -U nibabel
pip install -q ipython Sphinx sphinx-gallery numpydoc # TODO: move to pyproject.toml
pip install -e . --no-build-isolation --group dev
pip install -e . --group dev
python -c 'import cortex; print(cortex.__full_version__)'

- name: Cache Playwright browsers
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/claude.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y inkscape --no-install-recommends
pip install --upgrade pip
pip install wheel setuptools numpy cython
pip install -e '.[headless]' --no-build-isolation
pip install -e . --no-build-isolation --group dev
pip install -e '.[headless]' --group dev
python -c 'import cortex; print(cortex.__full_version__)'
# Combined with UV_NO_SYNC, this makes `uv run <cmd>` execute inside the
# environment installed above rather than a throwaway project venv.
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ jobs:
sudo apt-get update
sudo apt-get install -y inkscape --no-install-recommends
pip install --upgrade pip
pip install wheel setuptools numpy cython
# force using latest nibabel
pip install -U nibabel
pip install -e '.[headless]' --no-build-isolation
pip install -e . --no-build-isolation --group dev
pip install -e '.[headless]' --group dev
python -c 'import cortex; print(cortex.__full_version__)'

- name: Cache Playwright browsers
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Installation
To install the stable release version of pycortex, do the following:

```bash
# First, install some required dependencies (if not already installed)
pip install -U setuptools wheel numpy cython
# Install the latest release of pycortex from pip
pip install -U pycortex
# or, with headless rendering support:
Expand All @@ -31,11 +29,11 @@ pip install -U 'pycortex[all]'

If you wish to install the development version of pycortex, you can install it directly from Github.

To do so, replace the second install line above with the following:
To do so, replace the first install line above with the following:

```bash
# Install development version of pycortex from github
pip install -U git+https://github.com/gallantlab/pycortex.git --no-build-isolation
pip install -U git+https://github.com/gallantlab/pycortex.git
```

Note you will need a C compiler installed to build from scratch because there are cython code.
Expand Down
6 changes: 4 additions & 2 deletions cortex/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
from cortex._version import version as __version__
__full_version__ = __version__
except ImportError:
# Fallback for development environments without setuptools-scm
__version__ = '1.3.0.dev0'
# Build ran without setuptools-scm (e.g. --no-build-isolation without it
# installed), so _version.py was never generated. Use an obviously-wrong
# placeholder in this case.
__version__ = '0+unknown'
__full_version__ = __version__

__hardcoded_version__ = __version__
4 changes: 1 addition & 3 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@ Installation

To install the stable release version of pycortex, do the following::

# First, install some required dependencies
pip install -U setuptools wheel numpy cython
# Install the latest release of pycortex from pip
pip install -U pycortex


If you wish to install the development version of pycortex, you can install it directly from Github.

To do so, replace the second install line above with the following::
To do so, replace the first install line above with the following::

# Install development version of pycortex from github
pip install -U git+https://github.com/gallantlab/pycortex.git
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
# Minimum requirements for the build system to execute, according to PEP518
# specification.
requires = ["setuptools>=64", "setuptools-scm>=8", "build", "numpy>=1.13.0", "cython", "wheel"]
requires = ["setuptools>=66.1", "setuptools-scm>=8", "build", "numpy>=1.13.0", "cython", "wheel"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
Loading