From f8dfd56ff632907341940571933c2c64f0f45b8a Mon Sep 17 00:00:00 2001 From: Antony Lewis Date: Fri, 7 Jun 2024 18:07:50 +0100 Subject: [PATCH] test [testpypi] --- .github/workflows/build_wheels.yml | 2 +- docs/source/fortran_compilers.rst | 2 +- docs/source/index.rst | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 1e3bd325..dc014abc 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -151,4 +151,4 @@ jobs: run: python -m pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ camb - name: test - run: time python -m unittest camb.tests.camb_test + run: python -m unittest camb.tests.camb_test diff --git a/docs/source/fortran_compilers.rst b/docs/source/fortran_compilers.rst index f90b557b..311d178a 100644 --- a/docs/source/fortran_compilers.rst +++ b/docs/source/fortran_compilers.rst @@ -45,7 +45,7 @@ This includes in Jupyter notebooks; just re-start the kernel or use:: import IPython IPython.Application.instance().kernel.do_shutdown(True) -If you want to automamatically rebuild the library from Jupyter you can do something like this:: +If you want to automatically rebuild the library from Jupyter you can do something like this:: import subprocess import sys diff --git a/docs/source/index.rst b/docs/source/index.rst index 8af74a21..426a710e 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -21,17 +21,17 @@ If you want to work on the code from `GitHub `_, pip install -e ./CAMB [--user] You will need ifort or gfortran 6 or higher installed (and on your path) to compile; see :ref:`fortran-compilers` for -compiler installation details if needed. A compiled library for Windows is also provided, and is used if no -gfortran installation is found on Windows machines. If you have gfortran installed, "python setup.py make" will build +compiler installation details if needed. If you have gfortran installed, "python setup.py make" will build the Fortran library on all systems (including Windows without directly using a Makefile), and can be used to update a source installation after changes or pulling an updated version. +The standard pip installation includes binary pre-compiled code, so no need for a Fortran compiler +(unless you want to use custom sources/symbolic compilation features). Anaconda users can also install from conda-forge, best making a new clean environment using:: - conda create -n camb -c conda-forge python=3.9 camb + conda create -n camb -c conda-forge python=3.11 camb activate camb -with no need for a Fortran compiler (unless you want to use custom sources/symbolic compilation features). Check that conda installs the latest version, if not try installing in a new clean conda environment as above.