Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into current-develop
Browse files Browse the repository at this point in the history
* upstream/master: (82 commits)
  Fix: CORS response headers missing for media endpoint
  Bump version to 0.8.2.dev0
  Bump version to 0.8.1
  v0.8.1 release date
  Use pyproject.toml with black
  Changelog for pyeve#1185
  more preferred -> preferred
  Typos
  data_relation: wrong number of keys
  s/informations/information/
  M-x whitespace-cleanup
  Typos
  Changelog for pyeve#1184
  typo
  Changelog for pyeve#1183
  Changelog for pyeve#1183
  Chen Rotem
  typo
  Fix: OperationFailure when changing keys on existing index
  Add MONGO_AUTH_SOURCE to Quickstart snippet
  ...
  • Loading branch information
lexhung committed Dec 12, 2018
2 parents f1431ea + b5ca5ce commit 8c843eb
Show file tree
Hide file tree
Showing 104 changed files with 8,222 additions and 7,229 deletions.
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
**This issue tracker is a tool to address bugs in Eve itself.
Please use Stack Overflow for general questions about using Eve or issues not
related to Eve (see http://python-eve.org/support).**

If you'd like to report a bug in Eve, fill out the template below. Provide
any any extra information that may be useful / related to your problem.
Ideally, create an [MCVE](http://stackoverflow.com/help/mcve), which helps us
understand the problem and helps check that it is not caused by something in
your code.

---

### Expected Behavior

Tell us what should happen.

```python
Paste a minimal example that causes the problem.
```

### Actual Behavior

Tell us what happens instead.

```pytb
Paste the full traceback if there was an exception.
```

### Environment

* Python version:
* Eve version:
2 changes: 2 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
daysUntilStale: 180
staleLabel: stale
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ _build

.cache
.vscode
.pytest_cache
14 changes: 14 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
repos:
- repo: https://github.com/ambv/black
rev: stable
hooks:
- id: black
python_version: python3.6
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v1.3.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: debug-statements
- id: flake8
4 changes: 4 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
python:
pip_install: true
extra_requirements:
- docs
35 changes: 19 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
sudo: false
language: python
stages:
- linting
- test
cache: pip
script: tox
script: tox --recreate
python:
- 2.6
- 2.7
- 3.3
- 3.4
- 3.5
- 3.6
- pypy
install: travis_retry pip install tox-travis
services:
#- mongodb
- mongodb
- redis-server
before_script:
# work-around to make travis-ci working with mongod 3.4
# https://github.com/travis-ci/travis-ci/issues/3694
# https://github.com/travis-ci/apt-package-whitelist/issues/516
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.4.7.tgz -O /tmp/mongodb.tgz
- tar -xvf /tmp/mongodb.tgz
- mkdir /tmp/data
- ${PWD}/mongodb-linux-x86_64-3.4.7/bin/mongod --dbpath /tmp/data --bind_ip 127.0.0.1 --noauth &> /dev/null &
- until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done
- sleep 15
# timer is needed in order to get mongo to properly initialize on travis-ci
# See https://github.com/travis-ci/travis-ci/issues/1967#issuecomment-42008605
- "${PWD}/mongodb-linux-x86_64-3.4.7/bin/mongo eve_test --eval 'db.createUser({\"user\": \"test_user\", \"pwd\": \"test_pw\", \"roles\": [\"readWrite\", \"dbAdmin\"]},{\"w\": \"majority\" , \"wtimeout\": 5000 })'"
#- mongo eve_test --eval 'db.addUser("test_user", "test_pw");'
- mongo eve_test --eval 'db.createUser({user:"test_user",pwd:"test_pw",roles:["readWrite"]});'

jobs:
include:
- stage: linting
python: '3.6'
env:
install:
- pip install pre-commit
- pre-commit install-hooks
before_script:
services:
script:
- pre-commit run --all-files
5 changes: 4 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Development Lead

Patches and Contributions
`````````````````````````
- Alexander Dietmüller
- Alexander Hendorf
- Amedeo Bussi
- Andreas Røssland
Expand All @@ -24,6 +25,7 @@ Patches and Contributions
- Bryan Cattle
- Carl George
- Carles Bruguera
- Chen Rotem
- Christian Henke
- Christoph Witzany
- Christopher Larsen
Expand Down Expand Up @@ -122,7 +124,6 @@ Patches and Contributions
- Nick Park
- Nicolas Bazire
- Nicolas Carlier
- NotSpecial
- Olivier Carrère
- Olivier Poitrey
- Olof Johansson
Expand Down Expand Up @@ -165,10 +166,12 @@ Patches and Contributions
- Valerie Coffman
- Vasilis Lolis
- Wael M. Nasreddine
- Wan Bachtiar
- Wei Guan
- Xavi Cubillas
- boosh
- dccrazyboy
- kreynen
- mmizotin
- quentinpraz
- xgdgsc
Loading

0 comments on commit 8c843eb

Please sign in to comment.