Skip to content
This repository has been archived by the owner on Apr 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop' into release-2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
obdulia-losantos committed Jan 21, 2022
2 parents 9becf3f + 2d7d8e3 commit 3fd5578
Show file tree
Hide file tree
Showing 30 changed files with 326 additions and 269 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ script: ./scripts/test_travis.sh $TEST_MODE

after_failure: ./scripts/test_travis_failure.sh ${TEST_MODE:-}

env:
global:
- CONFLUENTINC_VERSION=6.1.1

# use matrix to parallelize tests
jobs:
fast_finish: true
Expand Down
32 changes: 18 additions & 14 deletions aether-entity-extraction-module/conf/pip/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,43 @@
################################################################################

aether.python==1.3.0
attrs==21.2.0
attrs==21.4.0
avro-python3==1.10.2
certifi==2021.10.8
charset-normalizer==2.0.7
coverage==6.0.2
decorator==5.1.0
charset-normalizer==2.0.10
coverage==6.2
decorator==5.1.1
Deprecated==1.2.13
eha-jsonpath==0.6.0
fakeredis==1.6.1
fakeredis==1.7.0
flake8==4.0.1
flake8-quotes==3.3.1
gevent==21.8.0
gevent==21.12.0
greenlet==1.1.2
idna==3.3
importlib-resources==5.4.0
iniconfig==1.1.1
jsonpath-ng==1.5.3
jsonschema==4.1.2
jsonschema==4.4.0
mccabe==0.6.1
packaging==21.0
packaging==21.3
pluggy==1.0.0
ply==3.11
py==1.10.0
py==1.11.0
pycodestyle==2.8.0
pyflakes==2.4.0
pyparsing==2.4.7
pyrsistent==0.18.0
pyparsing==3.0.7
pyrsistent==0.18.1
pytest==6.2.5
redis==3.5.3
requests==2.26.0
redis==4.0.2
requests==2.27.1
six==1.16.0
sortedcontainers==2.4.0
spavro==1.1.24
tblib==1.7.0
toml==0.10.2
urllib3==1.26.7
urllib3==1.26.8
wrapt==1.13.3
zipp==3.7.0
zope.event==4.5.0
zope.interface==5.4.0
2 changes: 1 addition & 1 deletion aether-entity-extraction-module/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ parallel = true
disable_warnings = no-data-collected

[coverage:report]
fail_under = 90
fail_under = 75
omit = *tests*, *settings.py
show_missing = true
1 change: 1 addition & 0 deletions aether-kernel/conf/pip/primary-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

# Aether Django SDK library with extras
aether.sdk[cache,server,storage,test]
django<4


# Aether Python library
Expand Down
89 changes: 47 additions & 42 deletions aether-kernel/conf/pip/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,94 +13,99 @@
################################################################################

aether.python==1.3.0
aether.sdk==1.4.0
aether.sdk==1.4.1
asgiref==3.4.1
attrs==21.2.0
autopep8==1.5.7
attrs==21.4.0
autopep8==1.6.0
avro-python3==1.10.2
boto3==1.19.1
botocore==1.22.1
boto3==1.20.40
botocore==1.23.40
cachetools==4.2.4
certifi==2021.10.8
charset-normalizer==2.0.7
configparser==5.0.2
charset-normalizer==2.0.10
configparser==5.2.0
coreapi==2.3.3
coreschema==0.0.4
coverage==6.0.2
decorator==5.1.0
Django==3.2.8
coverage==6.2
decorator==5.1.1
Deprecated==1.2.13
Django==3.2.11
django-cacheops==6.0
django-cleanup==5.2.0
django-cors-headers==3.10.0
django-debug-toolbar==3.2.2
django-cors-headers==3.11.0
django-debug-toolbar==3.2.4
django-dynamic-fixture==3.1.2
django-filter==21.1
django-minio-storage==0.3.10
django-model-utils==4.2.0
django-postgrespool2==2.0.1
django-prometheus==2.1.0
django-redis==5.0.0
django-silk==4.1.0
django-storages==1.12.2
django-prometheus==2.2.0
django-redis==5.2.0
django-silk==4.2.0
django-storages==1.12.3
django-uwsgi==0.2.2
djangorestframework==3.12.4
djangorestframework==3.13.1
drf-dynamic-fields==0.3.1
drf-yasg==1.20.0
eha-jsonpath==0.6.0
et-xmlfile==1.1.0
flake8==4.0.1
flake8-quotes==3.3.1
funcy==1.16
google-api-core==2.1.1
google-auth==2.3.0
google-cloud-core==2.1.0
google-cloud-storage==1.42.3
funcy==1.17
google-api-core==2.4.0
google-auth==2.3.3
google-cloud-core==2.2.2
google-cloud-storage==2.1.0
google-crc32c==1.3.0
google-resumable-media==2.0.3
googleapis-common-protos==1.53.0
google-resumable-media==2.1.0
googleapis-common-protos==1.54.0
gprof2dot==2021.2.21
greenlet==1.1.2
idna==3.3
importlib-metadata==4.10.1
importlib-resources==5.4.0
inflection==0.5.1
itypes==1.2.0
Jinja2==3.0.2
Jinja2==3.0.3
jmespath==0.10.0
jsonpath-ng==1.5.3
jsonschema==4.1.2
lxml==4.6.3
Markdown==3.3.4
jsonschema==4.4.0
lxml==4.7.1
Markdown==3.3.6
MarkupSafe==2.0.1
mccabe==0.6.1
minio==6.0.2
openpyxl==3.0.9
packaging==21.0
packaging==21.3
ply==3.11
prometheus-client==0.11.0
protobuf==3.19.0
psycopg2-binary==2.9.1
prometheus-client==0.12.0
protobuf==3.19.3
psycopg2-binary==2.9.3
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycodestyle==2.8.0
pyflakes==2.4.0
Pygments==2.10.0
pyparsing==2.4.7
pyrsistent==0.18.0
Pygments==2.11.2
pyparsing==3.0.7
pyrsistent==0.18.1
python-dateutil==2.8.2
python-json-logger==2.0.2
pytz==2021.3
redis==3.5.3
requests==2.26.0
rsa==4.7.2
ruamel.yaml==0.17.16
redis==4.1.1
requests==2.27.1
rsa==4.8
ruamel.yaml==0.17.20
ruamel.yaml.clib==0.2.6
s3transfer==0.5.0
sentry-sdk==1.4.3
sentry-sdk==1.5.3
six==1.16.0
spavro==1.1.24
SQLAlchemy==1.4.26
SQLAlchemy==1.4.31
sqlparse==0.4.2
tblib==1.7.0
toml==0.10.2
uritemplate==4.1.1
urllib3==1.26.7
urllib3==1.26.8
uWSGI==2.0.20
wrapt==1.13.3
zipp==3.7.0
2 changes: 1 addition & 1 deletion aether-odk-module/conf/pip/primary-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# Aether Django SDK library with extras
aether.sdk[cache,server,storage,test]

django<4

# xForm and data manipulation
lxml
Expand Down
76 changes: 41 additions & 35 deletions aether-odk-module/conf/pip/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,73 +12,79 @@
#
################################################################################

aether.sdk==1.4.0
aether.sdk==1.4.1
asgiref==3.4.1
autopep8==1.5.7
boto3==1.19.1
botocore==1.22.1
autopep8==1.6.0
boto3==1.20.40
botocore==1.23.40
cachetools==4.2.4
certifi==2021.10.8
charset-normalizer==2.0.7
configparser==5.0.2
coverage==6.0.2
Django==3.2.8
charset-normalizer==2.0.10
configparser==5.2.0
coverage==6.2
Deprecated==1.2.13
Django==3.2.11
django-cacheops==6.0
django-cleanup==5.2.0
django-cors-headers==3.10.0
django-debug-toolbar==3.2.2
django-cors-headers==3.11.0
django-debug-toolbar==3.2.4
django-minio-storage==0.3.10
django-postgrespool2==2.0.1
django-prometheus==2.1.0
django-redis==5.0.0
django-silk==4.1.0
django-storages==1.12.2
django-prometheus==2.2.0
django-redis==5.2.0
django-silk==4.2.0
django-storages==1.12.3
django-uwsgi==0.2.2
djangorestframework==3.12.4
djangorestframework==3.13.1
drf-dynamic-fields==0.3.1
flake8==4.0.1
flake8-quotes==3.3.1
funcy==1.16
google-api-core==2.1.1
google-auth==2.3.0
google-cloud-core==2.1.0
google-cloud-storage==1.42.3
funcy==1.17
google-api-core==2.4.0
google-auth==2.3.3
google-cloud-core==2.2.2
google-cloud-storage==2.1.0
google-crc32c==1.3.0
google-resumable-media==2.0.3
googleapis-common-protos==1.53.0
google-resumable-media==2.1.0
googleapis-common-protos==1.54.0
gprof2dot==2021.2.21
greenlet==1.1.2
idna==3.3
Jinja2==3.0.2
importlib-metadata==4.10.1
Jinja2==3.0.3
jmespath==0.10.0
lxml==4.6.3
Markdown==3.3.4
lxml==4.7.1
Markdown==3.3.6
MarkupSafe==2.0.1
mccabe==0.6.1
minio==6.0.2
prometheus-client==0.11.0
protobuf==3.19.0
psycopg2-binary==2.9.1
packaging==21.3
prometheus-client==0.12.0
protobuf==3.19.3
psycopg2-binary==2.9.3
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycodestyle==2.8.0
pyflakes==2.4.0
Pygments==2.10.0
Pygments==2.11.2
pyparsing==3.0.7
python-dateutil==2.8.2
python-json-logger==2.0.2
pytz==2021.3
pyxform==1.7.0
redis==3.5.3
requests==2.26.0
rsa==4.7.2
redis==4.1.1
requests==2.27.1
rsa==4.8
s3transfer==0.5.0
sentry-sdk==1.4.3
sentry-sdk==1.5.3
six==1.16.0
spavro==1.1.24
SQLAlchemy==1.4.26
SQLAlchemy==1.4.31
sqlparse==0.4.2
tblib==1.7.0
toml==0.10.2
urllib3==1.26.7
urllib3==1.26.8
uWSGI==2.0.20
wrapt==1.13.3
xlrd==1.2.0
zipp==3.7.0
Loading

0 comments on commit 3fd5578

Please sign in to comment.