Skip to content

Commit 7008cd7

Browse files
authored
Remove firedrake-install and friends (#4270)
1 parent 9b4f147 commit 7008cd7

17 files changed

+10
-5871
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Please do not add screenshots unless the bug is purely graphical.
2727
**Environment:**
2828
- OS: [eg: Linux, MacOS, WSL (Windows Subsystem for Linux)] add this as a label too!
2929
- Python version: [eg: 3.9.7]
30-
- Output of `firedrake-status`
30+
- Output of `pip list`
3131
- Any relevant environment variables or modifications [eg: PYOP2_DEBUG=1]
3232

3333
**Additional Info**

docs/source/conf.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,11 @@
8585
# built documents.
8686
#
8787
# The short X.Y version.
88-
import firedrake
89-
version = "%d.%d" % firedrake.__version_info__[0:2]
88+
import importlib.metadata
9089
# The full version, including alpha/beta/rc tags.
91-
release = firedrake.__version__
90+
release = importlib.metadata.version("firedrake")
91+
# Short version dropping the extra tags
92+
version = ".".join(release.split(".")[:3])
9293

9394
# The language for content autogenerated by Sphinx. Refer to documentation
9495
# for a list of supported languages.

docs/source/install.rst

+3-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ To simplify the installation process, Firedrake provides a utility script called
5656

5757
$ curl -O https://raw.githubusercontent.com/firedrakeproject/firedrake/master/scripts/firedrake-configure
5858

59-
Unlike the now deprecated ``firedrake-install`` script, ``firedrake-configure``
60-
**does not install Firedrake for you**. It is simply a helper script that emits
61-
the configuration options that Firedrake needs for the various steps needed
62-
during installation.
59+
Note that ``firedrake-configure`` **does not install Firedrake for you**. It
60+
is simply a helper script that emits the configuration options that Firedrake
61+
needs for the various steps needed during installation.
6362

6463
To improve robustness, ``firedrake-configure`` is intentionally kept extremely
6564
minimal and simple. This means that if you want to install Firedrake in a

firedrake/__init__.py

+1-10
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
from firedrake.variational_solver import *
7070
from firedrake.eigensolver import *
7171
from firedrake.vector import *
72-
from firedrake.version import __version__ as ver, __version_info__, check # noqa: F401
7372
from firedrake.ensemble import *
7473
from firedrake.randomfunctiongen import *
7574
from firedrake.external_operators import *
@@ -89,12 +88,7 @@
8988
sys.modules["firedrake.plot"] = plot
9089
from firedrake.plot import *
9190

92-
check()
93-
del check, sys
94-
95-
from firedrake._version import get_versions
96-
__version__ = get_versions()['version']
97-
del get_versions
91+
del sys
9892

9993

10094
def set_blas_num_threads():
@@ -157,6 +151,3 @@ def warn_omp_num_threads():
157151
_init_event.end()
158152
del _init_event
159153
del _is_logging
160-
161-
from . import _version
162-
__version__ = _version.get_versions()['version']

0 commit comments

Comments
 (0)