Rename Theano to Aesara

Author: brandonwillard

README.rst

@@ -15,6 +15,18 @@ Check out the `getting started guide <http://docs.pymc.io/notebooks/getting_star
 using Binder!
 For questions on PyMC3, head on over to our `PyMC Discourse <https://discourse.pymc.io/>`__ forum.
 
+The future of PyMC3 & Theano
+============================
+
+There have been many questions and uncertainty around the future of PyMC3 since Theano
+stopped getting developed by the original authors, and we started experiments with PyMC4.
+
+We are happy to announce that PyMC3 on Theano (which we are `developing further <https://github.com/pymc-devs/Theano-PyMC>`__)
+with a new JAX backend is the future. PyMC4 will not be developed further.
+
+See the `full announcement <https://pymc-devs.medium.com/the-future-of-pymc3-or-theano-is-dead-long-live-theano-d8005f8a0e9b>`__
+for more details.
+
 Features
 ========
 

pymc3/distributions/discrete.py

@@ -1364,6 +1364,7 @@ def categorical_logp(op, value, p, upper):
         Value(s) for which log-probability is calculated. If the log probabilities for multiple
         values are desired the values must be provided in a numpy array or `TensorVariable`
 
+<<<<<<< HEAD
     """
     p = p_ / aet.sum(p_, axis=-1, keepdims=True)
     k = aet.shape(p_)[-1]

pymc3/tests/test_distributions_timeseries.py

@@ -21,8 +21,11 @@
 from pymc3.model import Model
 from pymc3.sampling import sample, sample_posterior_predictive
 from pymc3.tests.helpers import select_by_precision
+<<<<<<< HEAD
 
 pytestmark = pytest.mark.xfail(reason="This test relies on the deprecated Distribution interface")
+=======
+>>>>>>> Rename Theano to Aesara
 
 pytestmark = pytest.mark.usefixtures("seeded_test")
 

requirements.txt

@@ -1,5 +1,5 @@
 aesara>=2.0.1
-arviz>=0.11.1
+arviz>=0.11.2
 dill
 fastprogress>=0.2.0
 numpy>=1.15.0