Merge dfa4548 into ff02092

inveniosoftware · Mar 16, 2020 · 6a97a86 · 6a97a86
2 parents ff02092 + dfa4548
commit 6a97a86
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,12 +15,9 @@ addons:
 notifications:
   email: false
 
-sudo: false
-
 services:
   - mysql
   - postgresql
-  - rabbitmq
 
 language: python
 
@@ -34,20 +31,15 @@ env:
     - ES7_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.2.0-linux-x86_64.tar.gz"
     - ES_HOST=127.0.0.1
   matrix:
-    # ES5 + MySQL
-    - REQUIREMENTS=lowest EXTRAS=all,mysql,elasticsearch5 SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_URL=$ES5_DOWNLOAD_URL
-    # ES6 + MySQL
-    - REQUIREMENTS=release EXTRAS=all,mysql,elasticsearch6 SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_URL=$ES6_DOWNLOAD_URL
-    # ES7 + PostgreSQL
-    - REQUIREMENTS=release EXTRAS=all,postgresql,elasticsearch7 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES7_DOWNLOAD_URL DEPLOY=true
-    # ES6 + PostgreSQL
-    - REQUIREMENTS=devel EXTRAS=all,postgresql,elasticsearch6 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES6_DOWNLOAD_URL
-    # ES7 + PostgreSQL
-    - REQUIREMENTS=devel EXTRAS=all,postgresql,elasticsearch7 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES7_DOWNLOAD_URL
+    - REQUIREMENTS=lowest EXTRAS=all,mysql,elasticsearch5 SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_URL=$ES5_DOWNLOAD_URL   # ES5 + MySQL
+    - REQUIREMENTS=release EXTRAS=all,mysql,elasticsearch6 SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_URL=$ES6_DOWNLOAD_URL  # ES6 + MySQL
+    - REQUIREMENTS=release EXTRAS=all,postgresql,elasticsearch7 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES7_DOWNLOAD_URL DEPLOY=true  # ES7 + PostgreSQL
+    - REQUIREMENTS=devel EXTRAS=all,postgresql,elasticsearch6 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES6_DOWNLOAD_URL  # ES6 + PostgreSQL
+    - REQUIREMENTS=devel EXTRAS=all,postgresql,elasticsearch7 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES7_DOWNLOAD_URL  # ES7 + PostgreSQL
 
 python:
-  - "2.7"
-  - "3.5"
+  - "3.6"
+  - "3.7"
 
 matrix:
   fast_finish: true
@@ -60,6 +52,7 @@ before_install:
   - "mkdir /tmp/elasticsearch"
   - "wget -O - ${ES_URL} | tar xz --directory=/tmp/elasticsearch --strip-components=1"
   - "/tmp/elasticsearch/bin/elasticsearch > /tmp/local-es.log &"
+  - "pip freeze"
   - "travis_retry pip install --upgrade pip setuptools py"
   - "travis_retry pip install twine wheel coveralls requirements-builder"
   - "requirements-builder -e $EXTRAS --level=min setup.py > .travis-lowest-requirements.txt"
@@ -71,6 +64,7 @@ before_install:
 install:
   - "travis_retry pip install -r .travis-${REQUIREMENTS}-requirements.txt"
   - "travis_retry pip install -e .[${EXTRAS}]"
+  - "pip freeze"
 
 before_script:
   # Allow ES to start
@@ -91,8 +85,9 @@ deploy:
   password:
     secure: "aowAp1qLIDaS8ahzhEJ+Sn8zqaO2VWQHy59gp667V74zKOKC4KkgverwTQjuJ1h88+CirUbWd3G45FUFZMzxJFx4JhZFG8296jerXCZrwlpoTqjvZZUvZTFtPEu7rq837jYuhGQMaiZs86+CjusBd+Q+SZO0738+TeGuXQouAHCgz3F3CuGtF2TLrFACLccNkUer6lH9GTtSSOdETOx1OX9CoiFcqJmd45Ud1aWqh5dxFl+FMev5q7O3+K3P2lp1r1A9RHzqvDgbrhaC8DrCx8cVCq5dovJQBW5pJyebtzFtVKA1Bxqgu+3aonZY6XxReNRbkWhZIByp5+m46MgSgCcqftvMhbjBvCEo8bElRbQB7V9xgqOqMujwic/6o6lFgz9FH6CpRNg/3/KuheJUjjs2JN34Q6L/Qd0JeBlmDE22g4j1Q1vPHmi30tRKCgi5JSepI9BFKB1kXhTi5dTWJcm+tzHyp3Yle6KfkemLtwjzhTySrWWmuck6RbGiPchjy2xFpuuEL9KYbztP+LrPIcJYB1g8wdME8tYPUaqJqdOqKlYtcpCyHgZO0aYqI+HbUb9EPebSDZjQNBT+uAiC2A0ZhIS8OkPaLmT8L37A1AvGTAI4sT1cptL5CK/xX1TXUjwzIIzpxjWNceYJg0XTnU/3UGoGlfhD15pNLLLzgUM="
   distributions: "compile_catalog sdist bdist_wheel"
+  skip_existing: true
   on:
     tags: true
-    python: "2.7"
+    python: "3.6"
     repo: inveniosoftware/invenio-oaiserver
     condition: $DEPLOY = true
diff --git a/invenio_oaiserver/percolator.py b/invenio_oaiserver/percolator.py
@@ -167,5 +167,3 @@ def get_record_sets(record):
         if set_name.startswith(prefix):
             name = set_name[prefix_len:]
             yield name
-
-    raise StopIteration
diff --git a/invenio_oaiserver/query.py b/invenio_oaiserver/query.py
@@ -57,9 +57,6 @@ def get_affected_records(spec=None, search_pattern=None):
     # X          ''         X
     # X          Y          X OR Y
 
-    if spec is None and search_pattern is None:
-        raise StopIteration
-
     queries = []
 
     if spec is not None:

diff --git a/requirements-devel.txt b/requirements-devel.txt
@@ -11,3 +11,4 @@
 -e git+git://github.com/inveniosoftware/invenio-records.git#egg=invenio-records
 -e git+git://github.com/inveniosoftware/invenio-pidstore.git#egg=invenio-pidstore
 -e git+git://github.com/inveniosoftware/invenio-search.git#egg=invenio-search
+-e git+https://github.com/inveniosoftware/invenio-base.git#egg=invenio-base
diff --git a/setup.py b/setup.py
@@ -16,11 +16,11 @@
 history = open('CHANGES.rst').read()
 
 tests_require = [
-    'SQLAlchemy-Continuum>=1.2.1',
+    'SQLAlchemy-Continuum>=1.3.6',
     'check-manifest>=0.25',
     'coverage>=4.0',
     'invenio-indexer>=1.1.0',
-    'invenio-jsonschemas>=1.0.0',
+    'invenio-jsonschemas>=1.1.0',
     'invenio-marc21>=1.0.0a9',
     'isort>=4.2.2',
     'mock>=1.3.0',
@@ -34,10 +34,10 @@
 
 extras_require = {
     'admin': [
-        'Flask-Admin>=1.3.0',
+        'invenio-admin>=1.2.0',
     ],
     'celery': [
-        'invenio-celery>=1.1.1',
+        'invenio-celery>=1.2.0',
     ],
     'docs': [
         'Sphinx>=1.6.7',
@@ -60,7 +60,7 @@
         'invenio-db[mysql]>=1.0.0',
     ],
     'postgresql': [
-        'invenio-db[postgresql]>=1.0.0',
+        'invenio-db[postgresql]>=1.0.4',
     ],
     'sqlite': [
         'invenio-db>=1.0.0',
@@ -84,14 +84,13 @@
 
 install_requires = [
     'arrow>=0.13.0',
-    'Flask>=0.11.1',
-    'Werkzeug>=0.14.1',
-    'Flask-BabelEx>=0.9.3',
     'dojson>=1.3.0',
-    'invenio-pidstore>=1.0.0',
-    'invenio-records>=1.0.0',
-    'invenio-rest>=1.1.1',
-    'lxml>=3.5.0',
+    'invenio-base>=1.2.2',
+    'invenio-i18n>=1.2.0',
+    'invenio-pidstore>=1.2.0',
+    'invenio-records>=1.3.0',
+    'invenio-rest>=1.2.0',
+    'lxml>=4.3.0',
 ]
 
 packages = find_packages()