Skip to content

Merge master test #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jun Aishima (JunAishima) wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Merge master test #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df6b5dc
use a session instead of requests directly
JunAishima Oct 1, 2024
82b276e
Merge branch 'use-session' into merge-master-test
JunAishima Oct 3, 2024
ad4fe9a
update versions, for conda test, install mongomock via pip
JunAishima Oct 8, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
dependencies: ["pip", "conda"]
fail-fast: false

Expand Down Expand Up @@ -53,7 +53,8 @@ jobs:
if: matrix.dependencies == 'conda'
run: |
set -vxeo pipefail
conda install -y -c conda-forge six mongoquery doct jsonschema mock mongomock pymongo pytest pyyaml requests tornado ujson
conda install -y -c conda-forge six mongoquery doct jsonschema mock pymongo pytest pyyaml requests tornado ujson
pip install mongomock

- name: Install the package
run: |
Expand Down
7 changes: 5 additions & 2 deletions analysisstore/client/asutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
import six


session = requests.Session()


def get_document(url, doc_type, as_json, contents):
r = requests.get(url, params=ujson.dumps(contents))
r = session.get(url, params=ujson.dumps(contents))
r.raise_for_status()
content = ujson.loads(r.text)
if as_json:
Expand All @@ -18,7 +21,7 @@ def get_document(url, doc_type, as_json, contents):

def post_document(url, contents):
try:
r = requests.post(url, data=ujson.dumps(contents))
r = session.post(url, data=ujson.dumps(contents))
except ConnectionError:
raise ConnectionError('No AnalysisStore server found')
r.raise_for_status() # this is for catching server side issue.
Expand Down