Skip to content
This repository was archived by the owner on Apr 21, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pycontribs/django-alexa
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.0.7
Choose a base ref
...
head repository: pycontribs/django-alexa
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Nov 28, 2016

  1. Added requests and pyOpenSSL to the requirements.

    They both seem to be required.
    Nizebulous committed Nov 28, 2016
    Copy the full SHA
    f2877d9 View commit details

Commits on Dec 28, 2016

  1. Copy the full SHA
    c0969ab View commit details

Commits on Dec 29, 2016

  1. Added license to setup.py

    J-Kirch committed Dec 29, 2016
    Copy the full SHA
    41e5b24 View commit details

Commits on Dec 30, 2016

  1. Copy the full SHA
    3757485 View commit details
  2. Copy the full SHA
    8dd1fd4 View commit details
  3. Copy the full SHA
    2187c16 View commit details
  4. Copy the full SHA
    1182e3e View commit details

Commits on Dec 31, 2016

  1. Copy the full SHA
    d5a2f87 View commit details
  2. Corrected some spelling

    J-Kirch committed Dec 31, 2016
    Copy the full SHA
    17508c6 View commit details
  3. Copy the full SHA
    8b3276e View commit details
  4. ignore pytest.ini file

    J-Kirch committed Dec 31, 2016
    Copy the full SHA
    226afc7 View commit details

Commits on Jan 2, 2017

  1. added mock for testing

    J-Kirch committed Jan 2, 2017
    Copy the full SHA
    170bc7d View commit details
  2. Copy the full SHA
    bbf210e View commit details

Commits on Jan 3, 2017

  1. added tests to validation.py

    J-Kirch committed Jan 3, 2017
    Copy the full SHA
    5e3dc69 View commit details

Commits on Jan 4, 2017

  1. Validation checked for length and inadvertently added a check against…

    … the encoding of the output.
    
    This commit will change this to look at the size of the variable and not force any form of encoding
    Christopher Allen-Poole committed Jan 4, 2017
    Copy the full SHA
    8651b15 View commit details

Commits on Jan 7, 2017

  1. Merge pull request #21 from Nizebulous/dom_requirements_update

    Added requests and pyOpenSSL to the requirements.
    Kyle authored Jan 7, 2017
    Copy the full SHA
    ca56a09 View commit details
  2. Merge branch 'master' into master

    Kyle authored Jan 7, 2017
    Copy the full SHA
    4a1c5cb View commit details
  3. Copy the full SHA
    542da58 View commit details
  4. Copy the full SHA
    2d9a6ba View commit details
  5. Merge pull request #23 from JohnnyKirchman/master

    Python 3 Compatibility
    Johnny Kirchman authored Jan 7, 2017
    Copy the full SHA
    6cf7998 View commit details
  6. moved py.test command to separate [pytest] section for faster local t…

    …ests using only pytest and avoiding tox
    J-Kirch committed Jan 7, 2017
    Copy the full SHA
    c48946e View commit details
  7. Copy the full SHA
    4f32e23 View commit details
  8. updated badge urls

    J-Kirch committed Jan 7, 2017
    Copy the full SHA
    cee071e View commit details
  9. Merge branch 'master' into master

    Johnny Kirchman authored Jan 7, 2017
    Copy the full SHA
    2434691 View commit details
  10. Merge pull request #25 from JohnnyKirchman/master

    Updated pytest, tox, and travis-ci settings, and updated readme badge urls.
    Johnny Kirchman authored Jan 7, 2017
    Copy the full SHA
    f2d0179 View commit details

Commits on Jan 8, 2017

  1. Merge branch 'master' into master

    Johnny Kirchman authored Jan 8, 2017
    Copy the full SHA
    b5115e5 View commit details
  2. corrected flake8 error

    Johnny Kirchman authored Jan 8, 2017
    Copy the full SHA
    94eb428 View commit details
  3. Merge pull request #24 from cwallenpoole/master

    Move from `len` to `sys.getsizeof`
    Johnny Kirchman authored Jan 8, 2017
    Copy the full SHA
    1b91a02 View commit details

Commits on Apr 22, 2017

  1. Copy the full SHA
    3b1eca5 View commit details

Commits on Apr 24, 2017

  1. Copy the full SHA
    3a2ed64 View commit details
  2. Copy the full SHA
    95ce711 View commit details
  3. Copy the full SHA
    43e3a92 View commit details
  4. Copy the full SHA
    b53d2bc View commit details
  5. Copy the full SHA
    367f174 View commit details
  6. Copy the full SHA
    aa5d1d0 View commit details
  7. Copy the full SHA
    0917cdb View commit details

Commits on May 27, 2017

  1. Decode request body into utf-8

    In Python 3 the request body is a `bytes` and `json.loads` only accepts a
    `str`. Currently a `TypeError` is raised.
    kolanos committed May 27, 2017
    Copy the full SHA
    9032b15 View commit details

Commits on Jun 5, 2017

  1. Merge pull request #28 from gilo-agilo/master

    ADDED: handling of images in cards (type:Standard)
    rocktavious authored Jun 5, 2017
    Copy the full SHA
    e40ef82 View commit details

Commits on Aug 16, 2017

  1. Copy the full SHA
    fac633c View commit details

Commits on Nov 6, 2018

  1. Refreshed requirements

    Fixes security issues.
    ssbarnea committed Nov 6, 2018
    Copy the full SHA
    fea6a0c View commit details

Commits on Jan 1, 2019

  1. Merge pull request #38 from pycontribs/bugfix

    Refreshed requirements
    ssbarnea authored Jan 1, 2019
    Copy the full SHA
    ed2d207 View commit details
  2. Copy the full SHA
    89bf45d View commit details
  3. Copy the full SHA
    b73758d View commit details

Commits on Jan 9, 2019

  1. Add pipenv for package control, upgrade to Django>2 version, add blac…

    …k formatter, remove python 2.7 from tox
    Ling Li committed Jan 9, 2019
    Copy the full SHA
    e776466 View commit details
  2. update dependenices

    Ling Li committed Jan 9, 2019
    Copy the full SHA
    ef8f465 View commit details
  3. Copy the full SHA
    e632042 View commit details
  4. Add some notes for contributing

    Ling Li committed Jan 9, 2019
    Copy the full SHA
    4cc187e View commit details
  5. change travis job to run against python 3.6 only

    Ling Li committed Jan 9, 2019
    Copy the full SHA
    fbd1262 View commit details
  6. Copy the full SHA
    2e2c660 View commit details
  7. include dev dependenices for travis builds

    Ling Li committed Jan 9, 2019
    Copy the full SHA
    c5d6cd5 View commit details
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@ cache:
directories:
- $HOME/.cache/pip
python:
- "2.7"
- "3.6"
install:
- "pip install -r requirements.txt"
- "pip install -r test-requirements.txt"
- "pip install pipenv"
- "pipenv install --dev"
- "python setup.py develop"
script:
- "flake8 django_alexa/"
- "py.test --cov-report term --cov django_alexa django_alexa_tests/"
- "py.test"
after_success:
coveralls
coveralls
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at Pycontrib@Ling-li.com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
19 changes: 19 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
SOURCEDIR = source
BUILDDIR = build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
30 changes: 30 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
pytest = "*"
pytest-cov = "*"
mock = "*"
tox = "*"
flake8 = "*"
flake8-colors = "*"
pyversion3 = "*"

[packages]
PyCryptodome = "*"
Django = "*"
djangorestframework = "*"
pyOpenSSL = "*"
pytz = "*"
requests = "*"
pyversion3 = "*"
sphinx = "*"
sphinx-rtd-theme = "*"

[requires]
python_version = "3.6"

[pipenv]
allow_prereleases = true
Loading