Skip to content

Update make.py#6530

Merged
jenshnielsen merged 2 commits into
matplotlib:masterfrom
klonuo:patch-1
Jun 13, 2016
Merged

Update make.py#6530
jenshnielsen merged 2 commits into
matplotlib:masterfrom
klonuo:patch-1

Conversation

@klonuo

@klonuo klonuo commented Jun 3, 2016

Copy link
Copy Markdown
Contributor

Referencing #6527, these changes provide:

  • fix for symlink exception on Windows
  • no need for rebuilding matplotlib from source

Referencing matplotlib#6527, these changes provide:

 - fix for symlink exception on Windows
 - no need for rebuilding matplotlib from source
@tacaswell tacaswell added this to the 2.0 (style change major release) milestone Jun 3, 2016
@tacaswell

Copy link
Copy Markdown
Member

@efiring I think this should fix your issue building the docs?

@jenshnielsen

Copy link
Copy Markdown
Member

Im a bit worried about coping the users default rc file for generating the documentation. This can result in the documentation unintentionally being generated with a non default style. Would it not be better to refactor the code out from setup.py that generates the rc file from the template and call that as part of make.py?

@tacaswell

Copy link
Copy Markdown
Member

Is this rcparam actually used building the docs or is in just something we serve?

@klonuo

klonuo commented Jun 3, 2016

Copy link
Copy Markdown
Contributor Author

@jenshnielsen is this ok?

--- a/doc/make.py
+++ b/doc/make.py
@@ -38,7 +38,9 @@

 def html(buildername='html'):
     check_build()
-    copy_if_out_of_date('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')
+    rc = '../lib/matplotlib/mpl-data/matplotlibrc'
+    rc = os.path.exists(rc) and rc or '../matplotlibrc.template'
+    copy_if_out_of_date(rc, '_static/matplotlibrc')
     if small_docs:
         options = "-D plot_formats=png:80"
     else:

@efiring

efiring commented Jun 3, 2016

Copy link
Copy Markdown
Member

It looks like it is used only here:
http://matplotlib.org/users/customizing.html?highlight=matplotlibrc
in which case it is the template with only the backend specification uncommented. We could always use the template as-is, or we could always start with the template and make the single line modification to select a backend. This would make the docs build independent of the builder's platform, assuming there is a mechanism in place that assures default rcParams when making the plots for the docs.

@klonuo

klonuo commented Jun 4, 2016

Copy link
Copy Markdown
Contributor Author

So I guess we should reference os.path.join(matplotlib._get_data_path(), 'matplotlibrc') instead?

That seems like default config, with only backend set.

@tacaswell

Copy link
Copy Markdown
Member

@klonuo I think that is correct.

Fallback to default "matplotlibrc" instead user's "matplotlibrc"
@jenshnielsen jenshnielsen merged commit 2ac4e88 into matplotlib:master Jun 13, 2016
@jenshnielsen

Copy link
Copy Markdown
Member

@klonuo Thanks

jenshnielsen added a commit that referenced this pull request Jun 13, 2016
@jenshnielsen

Copy link
Copy Markdown
Member

backported to 2.x as 96fb3a3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants