Commit Graph

2053 Commits

Author SHA1 Message Date
Carol Willing
864e7ac4ee Merge pull request #1193 from willingc/rtd-update
Remove mkdocs as workaround fixed in RTD upstream
2017-06-28 15:53:07 -07:00
Carol Willing
2207220592 Remove mkdocs as workaround fixed upstream 2017-06-28 15:50:35 -07:00
Min RK
a4a5781f7f invoke app when testing single-user 2017-06-28 21:55:15 +01:00
Min RK
194d2b9639 handle oauth id checks in tests 2017-06-28 21:55:15 +01:00
Min RK
530f499ce1 _version.py is private 2017-06-28 21:55:15 +01:00
Min RK
d167e275d1 compare hub and single-user server versions
in both directions - Hub checks singleuser server on spawn and singleuser server checks Hub on startup

if minor versions mismatch, log at warning level, otherwise debug
2017-06-28 21:55:15 +01:00
Min RK
cdcc7fc3c1 return http response from wait_for_http_server 2017-06-28 21:55:15 +01:00
Min RK
0a30e0ade5 put jupyterhub version in logs and headers 2017-06-28 21:55:15 +01:00
Min RK
47dc66db5a better handle a few values being undefined when launching single-user 2017-06-28 21:55:15 +01:00
Yuvi Panda
c192391551 Merge pull request #1189 from minrk/default-route
add default hub route via Proxy.add_route
2017-06-28 12:58:30 -07:00
Carol Willing
b0c44aa67a Merge pull request #1192 from willingc/fix-conda
Add mkdocs as RTD workaround
2017-06-28 08:21:48 -07:00
Carol Willing
29890dcfa9 Add mkdocs as RTD workaround 2017-06-28 04:46:06 -07:00
Min RK
1742065f77 Merge pull request #1191 from kroq-gar78/fix-anchors
Fix in-document anchors
2017-06-28 10:36:14 +01:00
Aditya Vaidya
28480d0359 Fix in-document anchors
Removes the explicit extension of the target if it's in the same
document. This allows these links to work in GitHub or in Read the Docs.
2017-06-28 01:57:45 -07:00
Min RK
2f57cfc812 respect port in testing subdomain host 2017-06-28 09:53:57 +01:00
Min RK
b12a52e266 run tests -v 2017-06-28 09:50:07 +01:00
Min RK
5d45a44247 use db_factory in Proxy
should avoid session crossover problems in tests

…still really need to move tests over to gen_test
2017-06-27 22:39:39 +01:00
Min RK
8ee520d99b filter out non-jupyterhub routes in CHP 2017-06-27 15:22:26 +01:00
Min RK
4c0d4ffc47 add default hub route via Proxy.add_route
instead of relying on default target
2017-06-27 15:22:26 +01:00
Min RK
44c00a2581 run test hub on a random port 2017-06-27 15:22:26 +01:00
Min RK
1015f3bf53 Merge pull request #1187 from minrk/fix-db
fix db reconnect when user.db changes
2017-06-27 15:21:20 +01:00
Yuvi Panda
71378d23d5 Merge pull request #1180 from minrk/auth-return-dict
allow .authenticate to return a dict containing name and state
2017-06-26 10:23:39 -07:00
Yuvi Panda
f5d0855c2b Merge pull request #1177 from minrk/proxy-routespec
define routespec
2017-06-26 10:05:07 -07:00
Min RK
88040362b0 fix db reconnect when user.db changes
store id on outer User, rather than accessing orm_user.id, which seems to fail sometimes

this may fix the recent increase in intermittent test failures
2017-06-26 12:46:55 +02:00
Min RK
8f49412438 docstrings for proxy 2017-06-26 11:32:15 +02:00
Min RK
bb417b98b8 Merge pull request #1184 from evanlinde/evanlinde-patch-1
Add '/tree' to spawner default_url
2017-06-25 08:36:18 +02:00
evanlinde
afed81d173 Fix default_url documentation 2017-06-24 23:07:31 -05:00
evanlinde
def99c1795 Add '/tree' to default_url
Add '/tree' to default_url so it doesn't have to be included in config file.
2017-06-23 16:22:41 -05:00
evanlinde
fcdea007ac Merge pull request #1 from jupyterhub/master
Trying to update local copy
2017-06-23 13:51:10 -05:00
Min RK
383b56276e fix versionchanged format 2017-06-23 18:51:51 +02:00
Min RK
11e6c38702 routespecs are strings (again)
- no slash means host-routing
- slash means no-host
2017-06-23 14:49:42 +02:00
Min RK
a2686ac27b always return dict from get_authenticated_user
outer APIs don't need to handle the different cases
2017-06-23 14:41:06 +02:00
Min RK
49bf4747fd avoid error in service.stop if service failed to start 2017-06-23 14:12:31 +02:00
Min RK
cf257c48b4 handle host-routing in add/get/delete 2017-06-23 14:12:31 +02:00
Min RK
05d939beac JSON shenanigans now that proxy route keys aren't strings 2017-06-23 14:12:31 +02:00
Min RK
fa7fed8ea3 routespec docstrings 2017-06-23 14:12:31 +02:00
Min RK
fbf5816952 handle leading/trailing slashes in RouteSpec 2017-06-23 14:12:31 +02:00
Min RK
31fc89c944 add RouteSpec namedtuple for route specification
namedtuple(path, host)

everywhere that accepts a RouteSpec must also accept a string
and treat it as RouteSpec(string).
RouteSpec.as_routespec(spec_or_string) handles this.
2017-06-23 14:12:30 +02:00
Min RK
f7a05713a1 allow .authenticate to return a dict containing name and state
Allows authenticators to set .auth_state from info in the initial authentication.
2017-06-22 15:19:45 +02:00
Yuvi Panda
9f532d6b2d Merge pull request #1176 from minrk/protect-pamela
delay errors on pamela import
2017-06-21 08:58:12 -07:00
Min RK
5263e4ceae user.state is keyed by server name 2017-06-21 16:52:54 +02:00
Min RK
3145011004 add multi-spawner info to user model 2017-06-21 16:33:39 +02:00
Min RK
5da4348c2d move some state to Spawner
now that there are more than one per user
2017-06-21 16:33:16 +02:00
Min RK
e33e34748f Re-sync with master 2017-06-21 15:33:01 +02:00
Min RK
d2e62a90d7 Merge pull request #1167 from minrk/more-env-less-argv
pass more arguments as environment variables instead of CLI args
2017-06-21 14:13:25 +02:00
Min RK
593a3c8ebb fix base_url handling in services
JUPYTERHUB_BASE_URL is the whole application base_url (default: /)
JUPYTERHUB_SERVICE_PREFIX is the service prefix (/user/name/)
2017-06-21 14:02:55 +02:00
Min RK
6713277f33 delay errors on pamela import
only raise ImportError on pamela if PAMAuthenticator is actually used

avoids failure to start in rare cases where pamela is not importable (e.g. broken libpam)
2017-06-21 11:17:13 +02:00
Min RK
178f1ed5e0 fix defaults in singleuser ip/port
when service url is undefined

never return None
2017-06-15 11:08:35 +02:00
Min RK
f5c703a04f update tests for env change 2017-06-15 11:08:35 +02:00
Min RK
27e83a3260 pass more arguments as environment variables instead of CLI args
env is often easier to deal with for Spawners

Now, only optional args are passed on the command-line and all required args come from environment variables.
2017-06-15 11:08:33 +02:00