Skip to content
This repository has been archived by the owner on Dec 14, 2023. It is now read-only.

Fix solr collections #842

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
815042a
Make no_dedup_sentences the default for extract-and-vector
philbudne Mar 6, 2022
c77dd18
common/Dockerfile: skip jieba.cache creation; makes empty root owned …
philbudne Mar 18, 2022
f37b7f9
solr-base/Dockerfile: try cloning mediacloud config as mediacloud64
philbudne Mar 18, 2022
e1be9a4
common/Dockerfile: reenable jieba.cache creation & chown it
philbudne Mar 23, 2022
1868296
apps/common/src/python/mediawords/solr/request.py: add/use SOLR_COLLE…
philbudne Mar 23, 2022
4ab3729
apps/import-solr-data/src/perl/MediaWords/Solr/Dump.pm: speedups for …
philbudne Mar 23, 2022
791248a
add apps/solr-base/src/solr/aliases.json with "mediacloud2" solr alias
philbudne Mar 23, 2022
c4fb3d6
apps/common/src/requirements.txt: force MarkupSafe==2.0.1
philbudne Mar 25, 2022
5845a61
solr-zookeeper: preload aliases.json into zookeeper
philbudne Mar 27, 2022
40391ed
apps/postgresql-server/bin/apply_migrations.sh: increase PGCTL_START_…
philbudne Apr 27, 2022
f395116
postgresql-pgbouncer/conf/pgbounder.init:
philbudne May 7, 2022
76be844
pgbouncer.ini: use postgresql server ip
philbudne May 7, 2022
bf74554
apps/webapp-api/src/perl/MediaWords/Controller/Api/V2/Timespans.pm
philbudne May 18, 2022
6654fbb
fix solr query on multiple collections
thepsalmist Nov 7, 2022
e6bc74d
refactor merge solr function
thepsalmist Nov 10, 2022
bc3c626
fix solr response schema
thepsalmist Feb 9, 2023
e8bb5a8
update solr merge function
thepsalmist Mar 7, 2023
cb168c9
fix solr merge buckets duplicat date values
thepsalmist Mar 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
apps/common/src/requirements.txt: force MarkupSafe==2.0.1
(Jinja2 2.11.3 can't cope with the new MarkupSafe 2.1.1)
  • Loading branch information
philbudne committed Mar 25, 2022
commit c4fb3d600a7d53118806e0bbdbfb0b936a3d9426
4 changes: 4 additions & 0 deletions apps/common/src/requirements.txt
Original file line number Diff line number Diff line change
@@ -43,6 +43,10 @@ furl==2.1.0
# Chinese language tokenizer, stemmer, etc.
jieba==0.42.1

# For Jinja2 2.11.3, which requests MarkupSafe>=0.23 and is now
# getting version 2.1.1, which removed a deprecated function.
MarkupSafe==2.0.1

# Parsing email templates
Jinja2==2.11.3