Skip to content

Commit

Permalink
Merge tag '1.0' into develop
Browse files Browse the repository at this point in the history
v1.0

* tag '1.0':
  lint and packaging
  • Loading branch information
saxix committed Dec 16, 2015
2 parents 8e7ba69 + f609f74 commit a90ee1b
Show file tree
Hide file tree
Showing 24 changed files with 254 additions and 189 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@ env:
- TOXENV=py27-d17
- TOXENV=py27-d18
- TOXENV=py27-d19

- TOXENV=py33-d17
- TOXENV=py33-d18
# - TOXENV=py35-d19

- TOXENV=py34-d19

install:
- pip install tox coverage python-coveralls>=2.5 coveralls>=0.5 codecov
- pip install tox "coverage<4.0" python-coveralls>=2.5 coveralls>=0.5 codecov

script:
- tox -e $TOXENV --recreate -- tests -vv --capture=no --cov=adminactions --cov-report=xml --cov-config=tests/.coveragerc
- tox -e $TOXENV -- tests -vv --capture=no --cov=adminactions --cov-report=xml --cov-config=tests/.coveragerc

before_success:
- coverage erase
Expand Down
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Release 1.0 (dev)
* merge :ghissue:`73` - Fixing merge on DateTimeField with null=True
* support settings.ADMINACTIONS_CSV_OPTIONS_DEFAULT
* support streaming CSV file response
* new `upper` and `lower` modifiers available for EmailField in mass update.


Release 0.8.5
=============
Expand Down
17 changes: 13 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ include AUTHORS.rst
include CHANGES
include LICENSE
include setup.py
recursive-include src *
recursive-include src/adminactions/templates *
recursive-include src/adminactions/static *
recursive-include src/adminactions/requirements *.pip
include setup.cfg
include tox.ini
include *.py
include Makefile
recursive-include docs *
recursive-include src *.css
recursive-include src *.js
recursive-include src *.pip
recursive-include src *.po
recursive-include src *.txt
recursive-include src/adminactions *.py
recursive-include src/adminactions *.html
recursive-include tests *
global-exclude *~
113 changes: 57 additions & 56 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys, os
import sys
import os

here = os.path.abspath(os.path.join(os.path.dirname(__file__)))
up = lambda base, level: os.path.abspath(os.path.join(base, *([os.pardir] * level)))
up = lambda base, level: os.path.abspath(
os.path.join(base, *([os.pardir] * level)))
sys.path.insert(0, up(here, 2))

import adminactions as app
Expand All @@ -26,16 +28,17 @@
# 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('.'))

# -- General configuration -----------------------------------------------------
# -- General configuration -----------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
needs_sphinx = '1.0'

# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext")))
sys.path.append(os.path.abspath(
os.path.join(os.path.dirname(__file__), "_ext")))
extensions = ['sphinx.ext.autodoc',
'sphinx.ext.todo',
'sphinx.ext.graphviz',
Expand All @@ -50,9 +53,9 @@
'github']


#issuetracker = 'github'
#issuetracker_project = 'saxix/django-adminactions'
#issuetracker_plaintext_issues = True
# issuetracker = 'github'
# issuetracker_project = 'saxix/django-adminactions'
# issuetracker_plaintext_issues = True
next_version = '0.9'
github_project_url = 'https://github.com/saxix/django-adminactions/'
github_project_url_basesource = 'https://github.com/saxix/django-adminactions/'
Expand All @@ -62,7 +65,7 @@
'python': ('http://python.readthedocs.org/en/latest/', None),
'django': ('http://django.readthedocs.org/en/1.7.x/', None),
'sphinx': ('http://sphinx.readthedocs.org/en/latest/', None)}
intersphinx_cache_limit = 90 # days
intersphinx_cache_limit = 90 # days

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand All @@ -71,7 +74,7 @@
source_suffix = '.rst'

# The encoding of source files.
#source_encoding = 'utf-8-sig'
# source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = 'index'
Expand All @@ -91,84 +94,82 @@

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

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'
# today_fmt = '%B %d, %Y'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['_build']

# The reST default role (used for this markup: `text`) to use for all documents.
#default_role = None
# default_role = None

# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True
# add_function_parentheses = True

# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
#add_module_names = True
# add_module_names = True

# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False
# show_authors = False

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'

# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
# modindex_common_prefix = []


# -- Options for HTML output ---------------------------------------------------
# -- Options for HTML output ---------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
import os

on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
if on_rtd:
html_theme = 'default'
if os.environ.get('READTHEDOCS', None) == 'True':
html_theme = "default"
else:
html_theme = 'nature'


import sphinx_rtd_theme
html_theme = "sphinx_rtd_theme"
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
#
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#html_theme_options = {}
# html_theme_options = {}

# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = ['.']

# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
#html_title = None
# html_title = None

# A shorter title for the navigation bar. Default is the same as html_title.
#html_short_title = None
# html_short_title = None

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
#html_logo = None
# html_logo = None

# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None
# html_favicon = None

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
#html_static_path = ['_static']
# html_static_path = ['_static']

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
# html_last_updated_fmt = '%b %d, %Y'

# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
Expand All @@ -178,52 +179,52 @@
# html_translator_class = "version.HTMLTranslator"

# Content template for the index page.
#html_index = ''
# html_index = ''

# Custom sidebar templates, maps document names to template names.
#html_sidebars = {}
# html_sidebars = {}

# Additional templates that should be rendered to pages, maps page names to
# template names.
#html_additional_pages = {}
# html_additional_pages = {}

# If false, no module index is generated.
#html_domain_indices = True
# html_domain_indices = True

# If false, no index is generated.
#html_use_index = True
# html_use_index = True

# If true, the index is split into individual pages for each letter.
#html_split_index = False
# html_split_index = False

# If true, links to the reST sources are added to the pages.
#html_show_sourcelink = True
# html_show_sourcelink = True

# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
#html_show_sphinx = True
# html_show_sphinx = True

# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
#html_show_copyright = True
# html_show_copyright = True

# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
#html_use_opensearch = ''
# html_use_opensearch = ''

# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None
# html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = 'djangoadminactionsdoc'


# -- Options for LaTeX output --------------------------------------------------
# -- Options for LaTeX output --------------------------------------------

# The paper size ('letter' or 'a4').
#latex_paper_size = 'letter'
# latex_paper_size = 'letter'

# The font size ('10pt', '11pt' or '12pt').
#latex_font_size = '10pt'
# latex_font_size = '10pt'

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
Expand All @@ -234,29 +235,29 @@

# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None
# latex_logo = None

# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
#latex_use_parts = False
# latex_use_parts = False

# If true, show page references after internal links.
#latex_show_pagerefs = False
# latex_show_pagerefs = False

# If true, show URL addresses after external links.
#latex_show_urls = False
# latex_show_urls = False

# Additional stuff for the LaTeX preamble.
#latex_preamble = ''
# latex_preamble = ''

# Documents to append as an appendix to all manuals.
#latex_appendices = []
# latex_appendices = []

# If false, no module index is generated.
#latex_domain_indices = True
# latex_domain_indices = True


# -- Options for manual page output --------------------------------------------
# -- Options for manual page output --------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
Expand Down
5 changes: 4 additions & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ django-adminactions
.. image:: https://secure.travis-ci.org/saxix/django-adminactions.png?branch=master
:target: http://travis-ci.org/saxix/django-adminactions/

.. image:: https://codecov.io/github/saxix/django-adminactions/coverage.svg?branch=master
:target: https://codecov.io/github/saxix/django-adminactions?branch=develop


Collection of useful actions to use with django.contrib.admin.ModelAdmin and/or django.contrib.admin.AdminSite


Expand Down Expand Up @@ -53,4 +57,3 @@ Indices and tables

* :ref:`genindex`
* :ref:`search`

6 changes: 4 additions & 2 deletions manage.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env python
import os, sys
here = os.path.abspath(os.path.join(os.path.dirname(__file__)))
import os
import sys

here = os.path.abspath(os.path.join(os.path.dirname(__file__)))
rel = lambda *args: os.path.join(here, *args)

sys.path.insert(0, rel(os.pardir))
Expand Down

0 comments on commit a90ee1b

Please sign in to comment.