841 Commits

Author SHA1 Message Date
kennethreitz f8ec666b4d Merge pull request #496 from javabrett/docker-pipenv
Dockerfile: Resolve deps using pipenv/Pipefile(.lock)
2018-11-07 15:31:50 -05:00
kennethreitz 0165e7ff9c Merge pull request #524 from javabrett/fix-repository
Corrected repository URL in app.json
2018-11-07 15:30:20 -05:00
Brett Randall 2f3921259b Corrected repository URL in app.json.
Signed-off-by: Brett Randall <javabrett@gmail.com>
2018-11-07 17:25:24 +11:00
Brett Randall be1413fb02 Changed Dockerfile to resolve deps using pipenv/Pipefile(.lock) before pip3->setup.py for httpbin.
Also added Pipfile(.lock) prior to the remaining source, improving Docker image cacheability.

Git is also required to fetch pyyaml.

This results in more deterministic and reproducible image builds, since httpbin dependencies
are installed using locked versions from Pipfile.lock before httpbin is itself installed.

Fixed #493.
2018-10-26 08:40:54 +11:00
Nate Prewitt 7b3b70dbca Merge pull request #512 from georgexsh/envheaders
remove duplicated "X-Forwarded-For" from ENV_HEADERS
2018-10-23 23:55:01 -07:00
George Xie 12dab7ba22 remove duplicated "X-Forwarded-For" from ENV_HEADERS 2018-10-24 14:30:40 +08:00
Nate Prewitt 992eaa40e6 Merge pull request #494 from javabrett/jquery-static-path
Removed (another) stray space from static path for jquery js
2018-10-23 22:52:53 -07:00
Nate Prewitt cca6786448 Merge pull request #501 from phanikiranthaticharla/new_branch
Removed httpbin.org link which is mentioned 3 times in README
2018-10-23 22:52:08 -07:00
Nate Prewitt 27fcacbfac Merge pull request #518 from javabrett/travis-tox-py37
Added Python 3.7 to Travis/Tox
2018-10-23 22:24:15 -07:00
Brett Randall 02b0d2d2ea Added Python 3.7 to Travis/Tox.
Signed-off-by: Brett Randall <javabrett@gmail.com>
2018-10-24 16:12:30 +11:00
Brett Randall ac3654e2bb Removed (another) stray space from static path for jquery js. 2018-10-23 15:37:54 +11:00
Ian Stapleton Cordasco 69c9c5c769 Merge pull request #495 from javabrett/dockerignore-dot-git
Changes in the local Git db should not invalidate Docker build cache
2018-09-11 07:13:21 -05:00
Ian Stapleton Cordasco bd3c030734 Merge pull request #507 from BoboTiG/fix-unclosed-file
Fix a ResourceWarning: unclosed file in core.py
2018-08-31 17:43:47 -05:00
Mickaël Schoentgen 52d823ce85 Fix a ResourceWarning: unclosed file in core.py 2018-08-31 16:43:37 +02:00
Phani Kiran Thaticharla fea47f6c2a Removed httpbin.org link which is mentioned 3 times in README
Signed-off-by: Phani Kiran Thaticharla <t.phani.kiran@gmail.com>
2018-08-12 10:49:59 -07:00
Nate Prewitt e4ee61fbc6 Merge pull request #500 from ghartsho/master
Fixed minor typos
2018-08-12 09:56:04 -07:00
Greg 20e93ee3bd Fixed minor typos with .. 2018-08-12 11:52:08 -05:00
Greg e7a12704a1 Fixed minor typos with """" 2018-08-12 11:50:51 -05:00
Brett Randall b6d0ae1e8b .dockerignore .git. Changes in the local Git db should not invalidate the Docker build cache. 2018-07-26 19:41:41 +10:00
kennethreitz 16f408a7ad Merge pull request #492 from javabrett/487-headers-dict-revert-457
Revert #457 "Support `show_env` param in `/headers`"
2018-07-25 08:52:07 -04:00
Brett Randall 59526b0915 Revert "Support show_env param in /headers", reverting #457. Fixed #487.
The docstring typo fixes are retained, along with the additional tests,
modified to revert to the original "headers": { dict format.

The reverted change get_dict('headers') -> get_headers() was not required. The
query-string ?show_env=1 was already effective in allowing env headers to be
returned.

This partially reverts commit 31ffe79981.
2018-07-25 12:38:39 +10:00
kennethreitz fce4d83397 Merge pull request #485 from steffenschroeder/master
Fixed #484 by correcting templates
2018-07-12 13:01:58 -04:00
kennethreitz 4cb4b1502d Merge pull request #490 from GammaGames/master
Update README.md
2018-07-12 13:01:42 -04:00
kennethreitz 5ba07086f0 Merge pull request #491 from phanikiranthaticharla/master
Removed hurl.it which is not reachable from references
2018-07-12 13:01:27 -04:00
Phani Kiran Thaticharla 503f55402d Removed hurl.it which is not reachable from references 2018-07-11 21:41:03 -07:00
Jesse Lieberg f942a3d422 Update README.md
Add instructions to run since the website keeps going down
2018-07-11 16:53:28 -06:00
Steffen Schröder 4db88dfa55 Added test to make sure index (/) will render correctly (to prevent #484) 2018-07-06 22:09:32 +02:00
Steffen Schröder 4c267df3d9 Bump version to 0.9.2 2018-07-06 21:35:00 +02:00
Steffen Schröder f83215d99b Fixed #484 by correcting template 2018-07-06 21:25:24 +02:00
kennethreitz c1633c8230 Revert "remove heroku files"
This reverts commit bfa5e3235f.
2018-07-04 12:02:43 -04:00
kennethreitz ee6b54671a Merge branch 'master' of github.com:kennethreitz/httpbin 2018-07-04 11:34:55 -04:00
kennethreitz efc3bf9a3f improve footer 2018-07-04 11:34:47 -04:00
kennethreitz 8545e2f05c Update README.md 2018-07-04 11:33:25 -04:00
kennethreitz bfa5e3235f remove heroku files 2018-07-04 11:31:31 -04:00
kennethreitz 56a2cf5763 new version 2018-07-04 11:29:12 -04:00
kennethreitz 660801081c fix broken things 2018-07-04 11:25:57 -04:00
kennethreitz 7079479690 add pyyaml for 3.7 2018-07-04 11:15:20 -04:00
kennethreitz ee15d0e5ec Merge pull request #457 from sanketsaurav/454-fix-headers-view
Fix #454: Support `show_env` param in `/headers`
2018-07-04 11:09:47 -04:00
kennethreitz 607ab2264a Merge pull request #462 from javabrett/setuptools-long-description
Added long_description for setuptools.
2018-07-04 11:08:13 -04:00
kennethreitz 4eb372f658 Merge branch 'master' into setuptools-long-description 2018-07-04 11:08:03 -04:00
kennethreitz d99d4e3110 Merge pull request #467 from hkosova/bearer-fix
Fix incorrect /bearer behavior
2018-07-04 11:07:26 -04:00
kennethreitz c5b6f39a5d Merge pull request #460 from javabrett/consolidate-version-string
Consolidate httpbin version string into a single location (VERSION)
2018-07-04 11:07:08 -04:00
kennethreitz 93e141807e Merge branch 'master' into consolidate-version-string 2018-07-04 11:07:01 -04:00
kennethreitz ae4845789f Merge pull request #461 from javabrett/manifest-fixes
Manifest fixes
2018-07-04 11:06:20 -04:00
kennethreitz ab17027316 Merge pull request #468 from hkosova/pretty-print-json
Pretty-print JSON responses
2018-07-04 11:06:05 -04:00
kennethreitz 36a3df2f82 Merge pull request #472 from SeverinLeonhardt/delay_more_methods
Support more HTTP methods for /delay
2018-07-04 11:05:16 -04:00
kennethreitz 27b604c435 Merge pull request #477 from javabrett/dockerignore-dockerfile
Added a .dockerignore file to ignore Dockerfile
2018-07-04 11:05:02 -04:00
kennethreitz 45350ffc20 Merge pull request #478 from Lucretiel/master
Documented query parameters for drip
2018-07-04 11:04:43 -04:00
kennethreitz 371dc248f8 Merge pull request #480 from javabrett/476-fix-redirect-to
Added url and status_code as query-string parameters for SwaggerUI
2018-07-04 11:04:25 -04:00
kennethreitz 8027ee956b Merge pull request #481 from requests/test
Test
2018-07-04 11:03:16 -04:00