From 867337f16f4c13580cb8026e344b08a4ca91056f Mon Sep 17 00:00:00 2001 From: Connor Ward Date: Mon, 25 Nov 2024 16:34:14 +0000 Subject: [PATCH] Revert firedrake-install location, to avoid breaking firedrake-update --- .github/workflows/build.yml | 2 +- .github/workflows/zenodo-canary.yml | 2 +- Makefile | 1 + docs/source/download.rst | 4 ++-- {firedrake/scripts => scripts}/firedrake-install | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) rename {firedrake/scripts => scripts}/firedrake-install (99%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 436cf97be1..909db6990a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: cd .. # Linting should ignore unquoted shell variable $COMPLEX # shellcheck disable=SC2086 - ./firedrake/firedrake/scripts/firedrake-install \ + ./firedrake/scripts/firedrake-install \ $COMPLEX \ --honour-petsc-dir \ --mpicc="$MPICH_DIR"/mpicc \ diff --git a/.github/workflows/zenodo-canary.yml b/.github/workflows/zenodo-canary.yml index e95e8717aa..02005590bd 100644 --- a/.github/workflows/zenodo-canary.yml +++ b/.github/workflows/zenodo-canary.yml @@ -25,7 +25,7 @@ jobs: pip install requests packaging - name: Zenodo API canary run: | - python firedrake/scripts/firedrake-install --test-doi-resolution + python scripts/firedrake-install --test-doi-resolution - name: Upload log uses: actions/upload-artifact@v4 if: failure() diff --git a/Makefile b/Makefile index 7dbd1a84f7..033504d3ef 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ lint: @python -m flake8 $(FLAKE8_FORMAT) firedrake @echo " Linting firedrake scripts" @python -m flake8 $(FLAKE8_FORMAT) firedrake/scripts --filename=* + @python -m flake8 $(FLAKE8_FORMAT) scripts --filename=* @echo " Linting firedrake tests" @python -m flake8 $(FLAKE8_FORMAT) tests @echo " Linting PyOP2" diff --git a/docs/source/download.rst b/docs/source/download.rst index 37c30614a2..0ac65e6854 100644 --- a/docs/source/download.rst +++ b/docs/source/download.rst @@ -8,7 +8,7 @@ Obtaining Firedrake Firedrake is installed using its install script:: - curl -O https://raw.githubusercontent.com/firedrakeproject/firedrake/master/firedrake/scripts/firedrake-install + curl -O https://raw.githubusercontent.com/firedrakeproject/firedrake/master/scripts/firedrake-install In the simplest cases, such as on a Mac with Homebrew installed or on an Ubuntu workstation on which the user has sudo acccess, the user can simply run:: @@ -232,7 +232,7 @@ You should now be able to run ``firedrake-update``. Installing Firedrake with pip (experimental, Linux only) -------------------------------------------------------- -Firedrake is working towards having support for binary installs. As such there is experimental support for installing Firedrake using ``pip``, avoiding the need for a ``firedrake-install`` script. At present only Linux is tested using this install method. +Firedrake has experimental support for installing using ``pip``, avoiding the need for the ``firedrake-install`` script. At present only Linux is tested using this install method. Requirements ~~~~~~~~~~~~ diff --git a/firedrake/scripts/firedrake-install b/scripts/firedrake-install similarity index 99% rename from firedrake/scripts/firedrake-install rename to scripts/firedrake-install index ea4997852d..a83b04a451 100755 --- a/firedrake/scripts/firedrake-install +++ b/scripts/firedrake-install @@ -1397,7 +1397,7 @@ def quit(message): def build_update_script(): log.info("Creating firedrake-update script.") - with open("firedrake/firedrake/scripts/firedrake-install", "r") as f: + with open("firedrake/scripts/firedrake-install", "r") as f: update_script = f.read() try: @@ -1410,7 +1410,7 @@ def build_update_script(): if args.rebuild_script: - os.chdir(os.path.dirname(os.path.realpath(__file__)) + ("/../../..")) + os.chdir(os.path.dirname(os.path.realpath(__file__)) + ("/../..")) build_update_script()