Skip to content

Commit

Permalink
Merge pull request #155 from spirosdelviniotis/hepcrawl_desy_spider
Browse files Browse the repository at this point in the history
desy: introduce desy spider
  • Loading branch information
david-caro authored Aug 24, 2017
2 parents fa74f59 + ec4bb9a commit f86419a
Show file tree
Hide file tree
Showing 71 changed files with 3,301 additions and 482 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ env:
- SUITE=unit
- SUITE=functional_wsp
- SUITE=functional_arxiv
- SUITE=functional_desy

matrix:
fast_finish: true
Expand Down
11 changes: 11 additions & 0 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ services:
- APP_CELERY_RESULT_BACKEND=amqp://guest:guest@rabbitmq:5672//
- APP_CRAWLER_HOST_URL=http://scrapyd:6800
- APP_API_PIPELINE_TASK_ENDPOINT_DEFAULT=hepcrawl.testlib.tasks.submit_results
- APP_FILES_STORE=/tmp/file_urls
- COVERAGE_PROCESS_START=/code/.coveragerc
- BASE_USER_UID=${BASE_USER_UID:-1000}
- BASE_USER_GIT=${BASE_USER_GIT:-1000}
Expand All @@ -26,6 +27,7 @@ services:
- ${PWD}:/code/
- ${PWD}/tests/functional/scrapyd_coverage_runner.conf:/etc/scrapyd/scrapyd.conf
- /tmp/WSP:/tmp/WSP
- /tmp/file_urls:/tmp/file_urls

functional_wsp:
<<: *service_base
Expand All @@ -34,6 +36,13 @@ services:
- scrapyd
- ftp_server

functional_desy:
<<: *service_base
command: py.test -vv tests/functional/desy
links:
- scrapyd
- ftp_server

functional_arxiv:
<<: *service_base
command: py.test -vv tests/functional/arxiv
Expand Down Expand Up @@ -68,6 +77,8 @@ services:
environment:
- PUBLICHOST=localhost
volumes:
- ${PWD}/tests/functional/desy/fixtures/ftp_server/FFT:/home/ftpusers/bob/FFT
- ${PWD}/tests/functional/desy/fixtures/ftp_server/DESY:/home/ftpusers/bob/DESY
- ${PWD}/tests/functional/wsp/fixtures/ftp_server/WSP:/home/ftpusers/bob/WSP
- ${PWD}/tests/functional/wsp/fixtures/ftp_server/pureftpd.passwd:/etc/pure-ftpd/passwd/pureftpd.passwd

Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
SPHINXAPIDOC = sphinx-apidoc -M -P -f -o $(SOURCEDIR) $(CODEDIR) -E $(CODEDIR)/spiders
SPHINXAPIDOC = sphinx-apidoc --module-first --private --force --separate --output-dir $(SOURCEDIR) $(CODEDIR) $(CODEDIR)/spiders

.PHONY: help
help:
Expand Down
7 changes: 7 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ def _warn_node(self, msg, *args, **kwargs):
'sphinx.ext.todo',
]


autodoc_default_flags = [
'members',
'private-members',
'show-inheritance',
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

Expand Down
6 changes: 6 additions & 0 deletions docs/spiders.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ Brown
.. automodule:: hepcrawl.spiders.brown_spider
:members:

Desy
~~~~

.. automodule:: hepcrawl.spiders.desy_spider
:members:

DNB
~~~

Expand Down
199 changes: 0 additions & 199 deletions hepcrawl/crawler2hep.py

This file was deleted.

Loading

0 comments on commit f86419a

Please sign in to comment.