Skip to content

Commit

Permalink
updating copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
dfm committed Sep 11, 2019
1 parent 0bd2c93 commit b226ec4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 13 deletions.
1 change: 1 addition & 0 deletions .appveyor.yml
Expand Up @@ -6,6 +6,7 @@ environment:
build: off

install:
- python -m pip install -U pip
- python -m pip install -U tox

test_script:
Expand Down
2 changes: 1 addition & 1 deletion .coveragerc
Expand Up @@ -14,7 +14,7 @@ exclude_lines =
except ImportError
def __len__
def __repr__
logging.warn
logging.warning
deprecation_warning
deprecated
if tqdm is None
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2010-2017 Daniel Foreman-Mackey & contributors.
Copyright (c) 2010-2019 Daniel Foreman-Mackey & contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
15 changes: 8 additions & 7 deletions docs/conf.py
Expand Up @@ -6,31 +6,32 @@
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.insert(0, os.path.abspath('..'))
sys.path.insert(0, os.path.abspath(".."))
from emcee import __version__ # NOQA

extensions = [
"sphinx.ext.autodoc",
"sphinx.ext.napoleon",
"sphinx.ext.mathjax",
]
templates_path = ['_templates']
source_suffix = '.rst'
master_doc = 'index'
templates_path = ["_templates"]
source_suffix = ".rst"
master_doc = "index"

project = 'emcee'
copyright = '2012-2017, Dan Foreman-Mackey & contributors'
project = "emcee"
copyright = "2012-2019, Dan Foreman-Mackey & contributors"
version = __version__
release = __version__

# Readthedocs.
on_rtd = os.environ.get("READTHEDOCS", None) == "True"
if not on_rtd:
import sphinx_rtd_theme

html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

html_theme = "sphinx_rtd_theme"
html_static_path = ['_static']
html_static_path = ["_static"]
html_favicon = "_static/favicon.png"
html_logo = "_static/logo2.png"
html_theme_options = {"logo_only": True}
2 changes: 1 addition & 1 deletion docs/index.rst
Expand Up @@ -101,7 +101,7 @@ Contributors
License & Attribution
---------------------

Copyright 2010-2017 Dan Foreman-Mackey and contributors.
Copyright 2010-2019 Dan Foreman-Mackey and contributors.

emcee is free software made available under the MIT License. For details
see the ``LICENSE``.
Expand Down
9 changes: 6 additions & 3 deletions emcee/pbar.py
Expand Up @@ -14,6 +14,7 @@

class _NoOpPBar(object):
"""This class implements the progress bar interface but does nothing"""

def __init__(self):
pass

Expand Down Expand Up @@ -41,14 +42,16 @@ def get_progress_bar(display, total):
"""
if display:
if tqdm is None:
logging.warn("You must install the tqdm library to use progress "
"indicators with emcee")
logging.warning(
"You must install the tqdm library to use progress "
"indicators with emcee"
)
return _NoOpPBar()
else:
if display is True:
return tqdm.tqdm(total=total)
else:
return getattr(tqdm, 'tqdm_' + display)(total=total)
return getattr(tqdm, "tqdm_" + display)(total=total)

return _NoOpPBar()

0 comments on commit b226ec4

Please sign in to comment.