Skip to content

Commit

Permalink
Merge branch 'master' into ISSUE-4250-add_batch_deliveries
Browse files Browse the repository at this point in the history
  • Loading branch information
Gallaecio authored Jul 16, 2020
2 parents 41263f6 + b97a39f commit c4f9250
Show file tree
Hide file tree
Showing 73 changed files with 1,689 additions and 1,603 deletions.
24 changes: 24 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
variables:
TOXENV: py
pool:
vmImage: 'windows-latest'
strategy:
matrix:
Python35:
python.version: '3.5'
TOXENV: windows-pinned
Python36:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '$(python.version)'
displayName: 'Use Python $(python.version)'
- script: |
pip install -U tox twine wheel codecov
tox
displayName: 'Run test suite'
13 changes: 13 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
'attrs': ('https://www.attrs.org/en/stable/', None),
'coverage': ('https://coverage.readthedocs.io/en/stable', None),
'cssselect': ('https://cssselect.readthedocs.io/en/latest', None),
'itemloaders': ('https://itemloaders.readthedocs.io/en/latest/', None),
'pytest': ('https://docs.pytest.org/en/latest', None),
'python': ('https://docs.python.org/3', None),
'sphinx': ('https://www.sphinx-doc.org/en/master', None),
Expand All @@ -305,3 +306,15 @@
"ref": "tooltip",
}
hoverxref_roles = ['command', 'reqmeta', 'setting', 'signal']


def setup(app):
app.connect('autodoc-skip-member', maybe_skip_member)


def maybe_skip_member(app, what, name, obj, skip, options):
if not skip:
# autodocs was generating a text "alias of" for the following members
# https://github.com/sphinx-doc/sphinx/issues/4422
return name in {'default_item_class', 'default_selector_class'}
return skip
4 changes: 3 additions & 1 deletion docs/topics/commands.rst
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ Supported options:
* ``--callback`` or ``-c``: spider method to use as callback for parsing the
response

* ``--meta`` or ``-m``: additional request meta that will be passed to the callback
* ``--meta`` or ``-m``: additional request meta that will be passed to the callback
request. This must be a valid json string. Example: --meta='{"foo" : "bar"}'

* ``--cbkwargs``: additional keyword arguments that will be passed to the callback.
Expand All @@ -491,6 +491,8 @@ Supported options:

* ``--verbose`` or ``-v``: display information for each depth level

* ``--output`` or ``-o``: dump scraped items to a file

.. skip: start
Usage example::
Expand Down
32 changes: 28 additions & 4 deletions docs/topics/feed-exports.rst
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,27 @@ You can also define a custom ACL for exported feeds using this setting:

* :setting:`FEED_STORAGE_S3_ACL`

.. _topics-feed-storage-gcs:

Google Cloud Storage (GCS)
--------------------------

The feeds are stored on `Google Cloud Storage`_.

* URI scheme: ``gs``
* Example URIs:

* ``gs://mybucket/path/to/export.csv``

* Required external libraries: `google-cloud-storage <https://cloud.google.com/storage/docs/reference/libraries#client-libraries-install-python>`_.

For more information about authentication, please refer to `Google Cloud documentation <https://cloud.google.com/docs/authentication/production>`_.

You can set a *Project ID* and *Access Control List (ACL)* through the following settings:

* :setting:`FEED_STORAGE_GCS_ACL`
* :setting:`GCS_PROJECT_ID`

.. _topics-feed-storage-stdout:

Standard output
Expand Down Expand Up @@ -427,10 +448,6 @@ format in :setting:`FEED_EXPORTERS`. E.g., to disable the built-in CSV exporter
'csv': None,
}

.. _URIs: https://en.wikipedia.org/wiki/Uniform_Resource_Identifier
.. _Amazon S3: https://aws.amazon.com/s3/
.. _botocore: https://github.com/boto/botocore
.. _Canned ACL: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl

.. setting:: FEED_EXPORT_BATCH_ITEM_COUNT

Expand Down Expand Up @@ -473,3 +490,10 @@ The command line above can generate a directory tree like::

Where the first and second files contain exactly 100 items. The last one contains
100 items or fewer.


.. _URIs: https://en.wikipedia.org/wiki/Uniform_Resource_Identifier
.. _Amazon S3: https://aws.amazon.com/s3/
.. _botocore: https://github.com/boto/botocore
.. _Canned ACL: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl
.. _Google Cloud Storage: https://cloud.google.com/storage/
Loading

0 comments on commit c4f9250

Please sign in to comment.