diff --git a/.github/workflows/pypi_release.yml b/.github/workflows/pypi_release.yml index 6be57ba7..53406d16 100644 --- a/.github/workflows/pypi_release.yml +++ b/.github/workflows/pypi_release.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true python-version: ${{ matrix.python-version }} @@ -47,11 +47,12 @@ jobs: os: [ubuntu-latest, macOS-latest, windows-latest] steps: - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true miniconda-version: "latest" python-version: ${{ matrix.python-version }} + architecture: ${{ runner.arch == 'ARM64' && 'arm64' || 'x64' }} - name: Conda info shell: bash -l {0} run: conda info diff --git a/docs/conf.py b/docs/conf.py index 878681dd..135faa56 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -21,10 +21,9 @@ import os import sys -from picasso import __version__ as picasso_version project = "Picasso" -copyright = "2019, Maximilian Thomas Strauss" +copyright = "2019-2026, Jungmann Lab" author = "Maximilian T. Strauss" # The short X.Y version @@ -32,7 +31,14 @@ # The full version, including alpha/beta/rc tags sys.path.insert(0, os.path.abspath("../..")) -release = picasso_version +# Read version directly from picasso/version.py to avoid importing the +# full package (which would require all runtime dependencies on RTD). +_version_globals = {} +with open( + os.path.join(os.path.dirname(__file__), "..", "picasso", "version.py") +) as _vf: + exec(_vf.read(), _version_globals) +release = _version_globals["__version__"] # -- General configuration ---------------------------------------------------