Commit Graph

6705 Commits (lencrypt)

Author SHA1 Message Date
eric 5a4241839c Merge remote-tracking branch 'Gluejar/master' into add-travis 2018-06-08 18:29:36 -04:00
eric 8fac19d445 Merge branch 'production' 2018-06-08 18:28:32 -04:00
eric d5933601af another permission issue 2018-06-08 17:55:40 -04:00
eric 23944c41da causes checkout errors 2018-06-08 17:51:27 -04:00
eric 8d6c23e167 revert 2018-06-08 17:31:25 -04:00
eric 55186ec743 more fixing 2018-06-08 17:25:33 -04:00
eric cac2866f30 emergency update 2018-06-08 16:39:03 -04:00
eric 36630094c9 Merge remote-tracking branch 'Gluejar/master' into production 2018-06-08 15:35:15 -04:00
eshellman 8d3cacb821
Merge pull request #781 from Gluejar/add-travis
files for running tests with travis
2018-06-08 15:34:31 -04:00
eric 455032ebc3 delint 2018-06-08 15:17:39 -04:00
eric 8b385d05ed fix Booxtreem LOCAL_TEST 2018-06-08 15:01:22 -04:00
eric ab3c1934d5 fix pdf tester
boto3 storage returns unicode not str someplace
2018-06-08 13:56:07 -04:00
eric ca5e5bed0c update boto 2018-06-08 13:55:05 -04:00
eric 8aae6808d1 thought I already did this 2018-06-07 16:28:12 -04:00
eric 4afe792a73 set TEST_INTEGRATION 2018-06-07 15:08:23 -04:00
eric f75fd07c76 use hosts not common 2018-06-07 14:39:36 -04:00
eric f597da88aa make sure common.keys overrides common 2018-06-07 13:05:25 -04:00
eric 3028c5f19d re-decrypt 2018-06-07 12:17:46 -04:00
eric 0deb76b678 make keys a module 2018-06-07 09:59:35 -04:00
eric cdce5e5fff user is specific to org 2018-06-06 23:34:06 -04:00
eric 3e782e636d files for running tests with travis 2018-06-06 23:27:08 -04:00
eshellman 985b65ea3f
Merge pull request #85 from EbookFoundation/catchup
Catchup
2018-06-06 22:44:38 -04:00
eshellman 92cdeedbc3
Merge pull request #780 from Gluejar/test-mobi
new mobigen
2018-06-06 22:32:55 -04:00
eric c422965bdb add column to EbookFile to indicate a failed make_mobi
so we don't keep trying with a bad epub file
2018-06-06 22:26:27 -04:00
eric e1553f8121 switch to dockerized mobi 2018-06-06 17:29:12 -04:00
eric eba9af93c3 debug travis mobigen 2018-06-06 11:26:02 -04:00
eric 05d4540a21 embarrassing 2018-06-06 09:36:17 -04:00
eric 32bff7c0ea it's py not yml! 2018-06-05 21:24:44 -04:00
eric f7c8610045 typo 2018-06-05 15:53:05 -04:00
eric 1ab2798086 encrypt again 2018-06-05 15:48:35 -04:00
eric 52f4cba735 wrong key in travis file 2018-06-05 15:26:37 -04:00
eric e13b91dda6 also add to travis keys 2018-06-05 15:22:42 -04:00
eric 4426ae19fc update to new mobigen server 2018-06-05 14:48:45 -04:00
eric f6310fde58 fix test 2018-06-05 14:48:22 -04:00
eric bfc5a14ebd add s3 keys 2018-05-25 08:45:16 -04:00
eric 20509e2ca7 py not yml 2018-05-25 07:16:45 -04:00
eric f174fc4317 make sure the keys directory exists 2018-05-24 21:47:40 -04:00
eric 2fa80458a1 fix paths 2018-05-24 17:36:54 -04:00
eric 3835729a54 encrypt some settings 2018-05-24 17:25:43 -04:00
eric 4898634901 wonder if PYTHONPATH can be .. 2018-05-24 12:47:48 -04:00
eric 303fcf44c4 oh, so that's what env does 2018-05-24 12:16:51 -04:00
eric d9aa6893b3 try setting PYTHONPATH 2018-05-24 12:04:31 -04:00
eric 66623f286e try "before_script" 2018-05-24 11:34:50 -04:00
eric 6af4082936 try add2virtualenv 2018-05-24 11:19:33 -04:00
eric 22865cc7b3 try following directions 2018-05-24 11:03:33 -04:00
eric d1cacf8ef9 apparently, having a setup.py is the right way to do it 2018-05-23 21:30:52 -04:00
eric 68e9833a21 again 2018-05-23 17:08:51 -04:00
eric c058f88c3a another try 2018-05-23 16:49:12 -04:00
eric 2860e0351f touch 2018-05-23 16:09:05 -04:00
eric beb152a755 see if we can easily get travis to do tests 2018-05-23 15:46:26 -04:00