Skip to content

Commit

Permalink
global: travis and invenio-base depencencies
Browse files Browse the repository at this point in the history
- updated travis and deps according to https://codimd.web.cern.ch/ZQl86wwkTp2ev_qmQXWyzQ?both
- replaced mock with standard library
  • Loading branch information
topless committed Mar 12, 2020
1 parent 9e70a01 commit 7752c39
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 13 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ notifications:

dist: xenial

sudo: false

language: python

matrix:
Expand All @@ -26,8 +24,8 @@ cache:
- pip

python:
- "2.7"
- "3.6"
- "3.7"

services:
- redis-server
Expand Down Expand Up @@ -84,6 +82,6 @@ deploy:
distributions: "sdist bdist_wheel"
on:
tags: true
python: "2.7"
python: "3.6"
repo: inveniosoftware/invenio-stats
condition: $DEPLOY = true
3 changes: 2 additions & 1 deletion requirements-devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
# -e git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2

-e git+https://github.com/inveniosoftware/invenio-queues.git#egg=invenio-queues
-e git+https://github.com/inveniosoftware/invenio-search.git#egg=invenio-search
-e git+https://github.com/inveniosoftware/invenio-search.git#egg=invenio-search
-e git+https://github.com/inveniosoftware/invenio-base.git#egg=invenio-base
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
'invenio-records>=1.0.0',
'invenio-records-ui>=1.0.1',
'isort>=4.2.15',
'mock>=1.3.0',
'pydocstyle>=1.0.0',
'pytest-cov>=1.8.0',
'pytest-pep8>=1.0.6',
Expand Down Expand Up @@ -70,14 +69,13 @@

install_requires = [
'counter-robots>=2018.6',
'Flask>=0.11.1',
'invenio-base>=1.2.2',
'invenio-cache>=1.0.0',
'invenio-celery>=1.1.3',
'invenio-queues>=1.0.0a2',
'maxminddb-geolite2>=2017.0404',
'python-dateutil>=2.6.1',
'python-geoip>=1.2',
'Werkzeug>=0.15.0,<1.0.0'
]

packages = find_packages()
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
from invenio_records.api import Record
from invenio_search import InvenioSearch, current_search, current_search_client
from kombu import Exchange
from mock import Mock, patch
from unittest.mock import Mock, patch
from six import BytesIO
from sqlalchemy_utils.functions import create_database, database_exists

Expand Down
2 changes: 1 addition & 1 deletion tests/contrib/test_event_builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import datetime

from mock import patch
from unittest.mock import patch

from invenio_stats.contrib.event_builders import file_download_event_builder, \
record_view_event_builder
Expand Down
2 changes: 1 addition & 1 deletion tests/test_aggregations.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from conftest import _create_file_download_event
from elasticsearch_dsl import Index, Search
from invenio_search import current_search
from mock import patch
from unittest.mock import patch

from invenio_stats import current_stats
from invenio_stats.aggregations import StatAggregator, filter_robots
Expand Down
2 changes: 1 addition & 1 deletion tests/test_processors.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from helpers import get_queue_size
from invenio_queues.proxies import current_queues
from invenio_search import current_search
from mock import patch
from unittest.mock import patch

from invenio_stats.contrib.event_builders import build_file_unique_id, \
file_download_event_builder
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

"""Test utility functions."""

from mock import patch
from unittest.mock import patch

from invenio_stats.utils import get_geoip, get_user, obj_or_import_string

Expand Down

0 comments on commit 7752c39

Please sign in to comment.