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 .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
hypothesis/h
40a/h
AFDudley/h
BigBlueHat/h
BinaryStars/h
CCH543/h
Cinemacloud/h
Ericgood/h
FTG-003/h
Forethinker/h
GratefulTony/h
HGldJ1966/h
JJediny/h
John-Williams/h
Laurian/h
LittleFancy/h
MattyQ/h
Mishkin2015/h
RichardLitt/h
Staffan1/h
SteelWagstaff/h
TowerBR/h
VanyTang/h
abigailricarte/h
ackermann/h
alecchap/h
alesarrett/h
alexsegura/h
almereyda/h
alon/h
andzi/h
angelicxsoul/h
ansmoh/h
apurvajalit/h
arjunvasan/h
asdevor/h
bZichett/h
badgettrg/Webmarks
balmas/h
balupton/h
bbarker/h
bennlich/h
benthor/h
blakewest/h
bogste/h
bradparks/h
brittanystoroz/h
buiquangchien/h
cdchapman/h
charblanc/h
chowsamihq/h
chr7stos/Webmarks
chrber/h
chrismPssina/h
christinaphamAD/h
cmbirk/h
codeaudit/h
coolcool21/h
cove/h
csillag/h
danjimilk/h
dannyhope/h
daredream/h
davidmcclure/h
dennisplucinik/h
dezynetechnologies/h
diegodlh/h
djcun95/h
donsequitur/h
edsu/h
eiro10/h
emckean/h
ercchy/h
eshellman/h
fangang123/h
fchasen/h
fcrimins/h
fhirsch/h
ficolo/h
fragkopoulos/h
gauravkeerthi/h
geass/h
gergely-ujvari/h
gitter-badger/h
gnott/h
gobengo/h
gorinovic/h
gus3000/h
hashin/h
helemaalbigt/h
hmstepanek/h
hwasiti/h
hylhero/h
hyperstudio/h
iHDeveloper/h
imeysam/h
jackspaceBerkeley/h
jarey/h
jasdeep/h
jason790/h
jasonzou/j
jazahn/h
jccr/h
jean/h
jeka57/h
jeremydean/h
jermnelson/h
jibe-b/h
jnishiyama/h
jojksd/h
jpadilla/h
jtremback/h
judell/h
juli-so/h
kabacs/h
karissa/h
kaushikvijay/h
kaydoh/h
kill4uk/h
klopiinas/h
klrkdekira/h
koulihong311/h
krassif/h
krstnkngs/h
leoqmp/h
linhua55/h
lucadealfaro/h
lyspooner/h
lyzadanger/h
m1yag1/h
magee/h
mambocab/h
manunymous/h
maraino/h
mari-ja/h
markbarratt/h
martinq/h
mbbaig/h
mcarv63/h
meawoppl/h
meflyup/h
metasj/h
mgasner/h
mgax/h
mollycr/h
mrchrisadams/h
mrienstra/h
mshavlovsky/h
muddasani/h
nagyist/hyphothesis-h
nagyistoce/hypothesis-h
nanxio/h
neozhangthe1/h
ningyifan/h
nkingsley/h
nlholdem/h
nlisgo/h
noscripter/h
nshkuro/h
odnodn/h
oliversauter/h
openbizgit/h
opengovfoundation/h
openstax/hypothesis-server
ouroboros8/h
pablomarti/h
pamo/h
philipn/h
philschatz/h
pinballwonder/h
plainspace/h
raowl/h
rickyhan/h
rmoorman/h
rmtsukuru/h
robertknight/h
rowhit/h
rsarxiv/h
saakaifoundry/h
samrose/h
scharf/h
shepazu/h
sherah/h
shofheinz/h
soapdog/h
ssin122/test-h
st-fresh/h
stuk88/h
sylvanmist/h
tetratorus/h
tilgovi/h
tomnar/h
trivenews/h
truthadjustr/h
utngz/h
voidfiles/h
wenchen/h
yargevad/h
yumatch/h
zshen777/h
Nothing to show
Choose a Head Repository
hypothesis/h
40a/h
AFDudley/h
BigBlueHat/h
BinaryStars/h
CCH543/h
Cinemacloud/h
Ericgood/h
FTG-003/h
Forethinker/h
GratefulTony/h
HGldJ1966/h
JJediny/h
John-Williams/h
Laurian/h
LittleFancy/h
MattyQ/h
Mishkin2015/h
RichardLitt/h
Staffan1/h
SteelWagstaff/h
TowerBR/h
VanyTang/h
abigailricarte/h
ackermann/h
alecchap/h
alesarrett/h
alexsegura/h
almereyda/h
alon/h
andzi/h
angelicxsoul/h
ansmoh/h
apurvajalit/h
arjunvasan/h
asdevor/h
bZichett/h
badgettrg/Webmarks
balmas/h
balupton/h
bbarker/h
bennlich/h
benthor/h
blakewest/h
bogste/h
bradparks/h
brittanystoroz/h
buiquangchien/h
cdchapman/h
charblanc/h
chowsamihq/h
chr7stos/Webmarks
chrber/h
chrismPssina/h
christinaphamAD/h
cmbirk/h
codeaudit/h
coolcool21/h
cove/h
csillag/h
danjimilk/h
dannyhope/h
daredream/h
davidmcclure/h
dennisplucinik/h
dezynetechnologies/h
diegodlh/h
djcun95/h
donsequitur/h
edsu/h
eiro10/h
emckean/h
ercchy/h
eshellman/h
fangang123/h
fchasen/h
fcrimins/h
fhirsch/h
ficolo/h
fragkopoulos/h
gauravkeerthi/h
geass/h
gergely-ujvari/h
gitter-badger/h
gnott/h
gobengo/h
gorinovic/h
gus3000/h
hashin/h
helemaalbigt/h
hmstepanek/h
hwasiti/h
hylhero/h
hyperstudio/h
iHDeveloper/h
imeysam/h
jackspaceBerkeley/h
jarey/h
jasdeep/h
jason790/h
jasonzou/j
jazahn/h
jccr/h
jean/h
jeka57/h
jeremydean/h
jermnelson/h
jibe-b/h
jnishiyama/h
jojksd/h
jpadilla/h
jtremback/h
judell/h
juli-so/h
kabacs/h
karissa/h
kaushikvijay/h
kaydoh/h
kill4uk/h
klopiinas/h
klrkdekira/h
koulihong311/h
krassif/h
krstnkngs/h
leoqmp/h
linhua55/h
lucadealfaro/h
lyspooner/h
lyzadanger/h
m1yag1/h
magee/h
mambocab/h
manunymous/h
maraino/h
mari-ja/h
markbarratt/h
martinq/h
mbbaig/h
mcarv63/h
meawoppl/h
meflyup/h
metasj/h
mgasner/h
mgax/h
mollycr/h
mrchrisadams/h
mrienstra/h
mshavlovsky/h
muddasani/h
nagyist/hyphothesis-h
nagyistoce/hypothesis-h
nanxio/h
neozhangthe1/h
ningyifan/h
nkingsley/h
nlholdem/h
nlisgo/h
noscripter/h
nshkuro/h
odnodn/h
oliversauter/h
openbizgit/h
opengovfoundation/h
openstax/hypothesis-server
ouroboros8/h
pablomarti/h
pamo/h
philipn/h
philschatz/h
pinballwonder/h
plainspace/h
raowl/h
rickyhan/h
rmoorman/h
rmtsukuru/h
robertknight/h
rowhit/h
rsarxiv/h
saakaifoundry/h
samrose/h
scharf/h
shepazu/h
sherah/h
shofheinz/h
soapdog/h
ssin122/test-h
st-fresh/h
stuk88/h
sylvanmist/h
tetratorus/h
tilgovi/h
tomnar/h
trivenews/h
truthadjustr/h
utngz/h
voidfiles/h
wenchen/h
yargevad/h
yumatch/h
zshen777/h
Nothing to show
  • 6 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 29, 2015
Use test.ini when building test extensions
Using development.ini to test extension builds isn't ideal, because
basemodel.create_all is set to True, which attempts to contact
ElasticSearch, which isn't running on Travis.
Use test.ini when building test extensions
Using development.ini to test extension builds isn't ideal, because
basemodel.create_all is set to True, which attempts to contact
ElasticSearch, which isn't running on Travis.
Add buildkite automation scripts to Dockerfile
These are only small, and adding them to the Docker image makes it
possible to run the tests from the vanilla built image relatively
simply, by running (for example)

    docker run hypothesis/h ./.buildkite/bin/test-frontend

or

    docker run hypothesis/h ./.buildkite/bin/test-backend
Remove Dockerfile ENTRYPOINT
The Dockerfile ENTRYPOINT makes it convenient to run commands which have
a common prefix, while making it much harder to run commands which do
not.

For the purposes of running tests (as well as from a more general
"principle of least surprise") it makes more sense to remove the
ENTRYPOINT and specify a default command instead.
Showing with 91 additions and 5 deletions.
  1. +9 −0 .buildkite/bin/test-backend
  2. +15 −0 .buildkite/bin/test-frontend
  3. +2 −2 .travis.yml
  4. +2 −2 Dockerfile
  5. +8 −1 conf/test.ini
  6. +55 −0 conf/testext.ini
@@ -0,0 +1,9 @@
#!/bin/sh
set -eu
echo "--- Installing dependencies"
pip install -e .[dev,testing,YAML]
echo "+++ Running tests"
exec python setup.py test --cov
@@ -0,0 +1,15 @@
#!/bin/sh
set -eu
export DEBIAN_FRONTEND=noninteractive
echo "--- Installing PhantomJS"
apt-get update
apt-get install -y phantomjs
echo "--- Installing dependencies"
npm install
echo "+++ Running tests"
exec $(npm bin)/karma start h/static/scripts/karma.config.js --single-run
View
@@ -15,8 +15,8 @@ script:
- make test
- make cover
- make lint
- hypothesis-buildext conf/development.ini chrome --base http://localhost
- hypothesis-buildext conf/development.ini firefox --base http://localhost
- hypothesis-buildext conf/testext.ini chrome --base http://localhost
- hypothesis-buildext conf/testext.ini firefox --base http://localhost
- "hypothesis-buildext conf/production.ini chrome
--base https://hypothes.is
--assets chrome-extension://notarealkey/public"
View
@@ -51,12 +51,12 @@ ADD gunicorn.conf.py /src/h/
ADD bin /src/h/bin
ADD conf /src/h/conf
ADD h /src/h/h
ADD .buildkite /src/h/.buildkite
RUN pip install -r requirements.txt
# Services (for runit)
ADD ./svc /etc/service
# Startup and ports
ENTRYPOINT ["/sbin/my_init"]
CMD []
CMD ["/sbin/my_init"]
EXPOSE 8000
View
@@ -3,6 +3,12 @@ use: egg:h
es.host: http://localhost:9200
h.feature.accounts: True
h.feature.api: True
h.feature.claim: True
h.feature.streamer: True
h.feature.notification: True
sqlalchemy.url: sqlite://
webassets.base_dir: h:static
@@ -14,7 +20,8 @@ webassets.manifest: False
webassets.static_view: True
webassets.uglifyjs_bin: node_modules/.bin/uglifyjs
webassets.cleancss_bin: node_modules/.bin/cleancss
webassets.coffee_bin: node_modules/.bin/coffee
webassets.browserify_pipe_bin: bin/browserify-pipe
[loggers]
keys = root, h
View
@@ -0,0 +1,55 @@
[app:main]
use: egg:h
es.host: http://localhost:9200
h.feature.accounts: True
h.feature.api: True
h.feature.claim: True
h.feature.streamer: True
h.feature.notification: True
sqlalchemy.url: sqlite://
webassets.base_dir: h:static
webassets.base_url: assets
webassets.coffee_no_bare: True
webassets.cache: False
webassets.debug: True
webassets.manifest: False
webassets.static_view: True
webassets.uglifyjs_bin: node_modules/.bin/uglifyjs
webassets.cleancss_bin: node_modules/.bin/cleancss
webassets.browserify_pipe_bin: bin/browserify-pipe
[loggers]
keys = root, h
[handlers]
keys = console
[formatters]
keys = generic
[logger_root]
handlers = console
[logger_h]
level = INFO
handlers =
qualname = h
[handler_console]
class = StreamHandler
args = ()
formatter = generic
[formatter_generic]
format = %(asctime)s [%(process)d] [%(name)s:%(levelname)s] %(message)s

No commit comments for this range