RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,731 Commits 49 Branches 132 Tags 148 MiB
Commit Graph

5731 Commits

Author SHA1 Message Date
Elias Dorneles 4eec05351f remove bumpversion prerelease configuration 
I propose to remove the prerelease configuration from bumpversion,
because I think its behavior is just too confusing.

The rational for this is that making the release procedure predictable
is more important than facilitating making pre-releases, which are sort
of the exception in the workflow.

The current configuration makes most common cases confusing:

* bug fix releases require you have to remember to use `--serialize "{major}.{minor}.{patch}"`
* to start a pre-release cycle, you actually use `minor` or `patch`
* to do the actual minor or patch release, you use `prerel`

Also, `prerel` breaks if you run it on a branch with a final release,
because it can't parse the prerelease information.

Therefore, I propose keeping the bumpversion defaults, and do the
prereleases (dev1, dev2, rc1, etc) manually (with `--new-version`),
which makes for a more predictable and intuitive behavior.

* `bumpversion minor` and `bumpversion patch` will work as expected
* pre-releases will be manually handled, but this seems a small overhead
  than remembering the details I mention above.

If you're happy with this, I'll also update [the wiki][1] with new
instructions.

[1]: https://github.com/scrapy/scrapy/wiki/Scrapy-release-procedure
 2016-08-01 11:37:51 -03:00
Mikhail Korobov 2c9a38d1f5 Merge pull request #2153 from Digenis/Selector_bad_args 
[MRG+1] Selector should not receive both response and text
 2016-07-31 21:28:38 -04:00
Νικόλαος-Διγενής Καραγιάννης 643dbeffcf Selector should not receive both response and text 2016-07-30 10:35:16 +03:00
Elias Dorneles 34e7dadf38 Merge pull request #1610 from darshanime/scheduler_debug 
[MGR+1] Change, document `LOG_UNSERIALIZABLE_REQUESTS`
 2016-07-29 10:12:52 -03:00
darshanime d8e62e660d update log demo print 2016-07-26 20:46:12 +05:30
Paul Tremberth fe68a45c82 Merge pull request #2138 from jesuslosada/master 
[MRG+1] Apply the FILES_STORE_S3_ACL setting in ImagesPipeline
 2016-07-26 12:50:25 +02:00
Elias Dorneles b6375d3701 Merge pull request #1566 from darshanime/signal-example 
[MRG+1] Include example for signal docs
 2016-07-25 10:49:29 -03:00
Darshan Chaudhary a2e6452554 Include signal example 2016-07-25 18:41:25 +05:30
darshanime 0c77b6d033 update docs for settings 2016-07-25 18:05:51 +05:30
Darshan Chaudhary 2d9e5937c6 Include deprecated warning 2016-07-25 18:05:51 +05:30
Darshan Chaudhary 472a8a47d0 Change name, log once 2016-07-25 18:03:43 +05:30
Jesús Losada 8221556089 Add documentation on Amazon S3 ACLs 2016-07-22 23:22:18 +02:00
Jesús Losada c6a2ca4e93 Document S3 capabilities in FilesPipeline and ImagesPipeline 2016-07-22 19:32:29 +02:00
Jesús Losada f72991a96b Add the IMAGES_STORE_S3_ACL setting 2016-07-22 19:18:13 +02:00
Paul Tremberth ec1c61504a Merge pull request #2005 from feliperuhland/master 
[MRG+1] Included new optional parameter in startproject command line
 2016-07-19 12:31:06 +02:00
Felipe Ruhland fe088925a3 Included implementation notes in docstring 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
 2016-07-19 00:12:39 -03:00
Felipe Ruhland de64a1f68a Fix scrapy.cfg validation 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
 2016-07-19 00:04:45 -03:00
Elias Dorneles a86562b72b Merge pull request #2128 from kas/patch-1 
(docs) Minor grammar fix in logging.rst
 2016-07-18 09:24:03 -03:00
Kenneth Schnall 5fabed514e Update logging.rst 2016-07-15 23:14:11 -04:00
Mikhail Korobov 79639d0fec Merge pull request #1989 from pawelmhm/fix-images-pipeline-uppercase-other 
[MRG+1] [image_pipeline] bring back uppercase class attributes
 2016-07-13 14:44:00 +00:00
Pawel Miech ceecf3b26c [image_pipeline] minor style tweaks 2016-07-13 16:19:24 +02:00
Mikhail Korobov 2dd1a9e3bc Merge pull request #2094 from redapple/dns-invalid-id 
Catch and ignore certification verification exception for IP-address hosts
 2016-07-13 10:48:08 +00:00
Paul Tremberth 005cf949b8 Change wording of warning + docstring for ScrapyClientTLSOptions 2016-07-13 11:01:30 +02:00
Elias Dorneles 3b5915568b Merge pull request #2120 from kas/kas-patch-1 
(docs) Fix small grammar issue in practices.rst (Supersedes #2119)
 2016-07-12 17:05:39 -03:00
Kenneth Schnall 2489f84d39 Update practices.rst 2016-07-12 15:34:50 -04:00
Paul Tremberth 859bcf4820 Rephrase warning 2016-07-12 17:53:19 +02:00
Paul Tremberth c3109daa72 Merge pull request #2034 from dracony/master 
[MRG+1] Added option to turn off ensure_ascii for JSON exporters
 2016-07-12 17:01:09 +02:00
Dracony 33a39b368f added FEED_EXPORT_ENCODING setting to allow encoding specification 2016-07-12 16:20:17 +02:00
Pawel Miech 9818c97f6e [image_pipeline] dont use assert in doctest 2016-07-12 14:15:41 +02:00
Pawel Miech c22cc1096b [image_pipeline] style edits 
* 80 characters line limit
* shortening some code
* removed dead code
* add doctest for _key_for_pipe function
 2016-07-12 13:58:36 +02:00
Paul Tremberth 8a22a74e48 Merge pull request #2065 from redapple/octet-stream-no-decompress 
[MRG+2] [HttpCompressionMW] Do not decompress gzip binary/octet-stream responses
 2016-07-11 12:15:38 +02:00
Paul Tremberth 962eb11c73 Simplify regex conditions 2016-07-11 11:30:05 +02:00
Paul Tremberth 778f1cf84c Merge remote-tracking branch 'origin/master' into octet-stream-no-decompress 2016-07-08 18:13:20 +02:00
Elias Dorneles d43a35735a Merge pull request #2050 from Tethik/is_gzipped_fix 
[MRG+1] Is_gzipped for application/x-gzip;charset=utf-8
 2016-07-08 08:47:56 -03:00
Mikhail Korobov b7553d921a Merge pull request #2038 from redapple/canonicalize-idna-failures 
[MRG] Do not fail on canonicalizing URLs with wrong netlocs
 2016-07-08 10:47:54 +06:00
Mikhail Korobov 5f261cf295 Merge pull request #2026 from Digenis/contributing-full_subjects 
[MRG+1] Encourage complete titles in pull requests
 2016-07-08 10:45:22 +06:00
Mikhail Korobov 52a52e2388 Merge pull request #2001 from matveinazaruk/issue-2000 
[MRG+1] Fixed choosing of response class.
 2016-07-08 10:44:24 +06:00
Elias Dorneles 0ab7c1fbf9 Merge pull request #2052 from stummjr/genspider-standalone 
[MRG+1] Enable genspider command outside project folder
 2016-07-06 18:01:30 -03:00
Valdir Stumm Junior 081595a2e4 document new genspider behavior 2016-07-06 15:10:48 -03:00
Valdir Stumm Junior 8987b17730 remove references to Item classes in templates 2016-07-06 15:10:48 -03:00
Valdir Stumm Junior 1779f5feca enable genspider command outside projects 2016-07-06 15:10:48 -03:00
Mikhail Korobov 759a555d28 Merge pull request #2069 from redapple/https-connect-host 
[MRG] Add "Host" header in CONNECT requests to HTTPS proxies
 2016-07-06 21:43:41 +06:00
Paul Tremberth 1737c15826 Merge pull request #2091 from eLRuLL/default_headers_priority 
[MRG+1] prioritize default headers over user agent middlewares
 2016-07-06 17:29:39 +02:00
Paul Tremberth 15d0c89159 Cleanup unused argument 2016-07-06 17:15:21 +02:00
Mikhail Korobov 8ec6c22d60 Merge pull request #2095 from scrapy/testing-deps 
[MRG+1] TST pin pytest-cov to 2.2.1; upgrade pytest
 2016-07-06 20:07:19 +06:00
Mikhail Korobov 4273734744 TST pin pytest-cov to 2.2.1; upgrade pytest 2016-07-06 18:29:49 +05:00
Paul Tremberth 37efdde3e3 Catch and ignore TLS verification exception for IP-address hosts 
Fixes GH-2092
 2016-07-06 14:20:13 +02:00
Raul Gallegos 49ac7de231 prioritize default headers over user agent 2016-07-05 15:38:17 -05:00
Elias Dorneles 441df4c853 Merge pull request #2060 from pawelmhm/windows-python3 
[MRG+1] [docs] add note about windows + python3
 2016-07-05 10:26:33 -03:00
Νικόλαος-Διγενής Καραγιάννης 2a92ffb409 Encourage descriptive PR titles 2016-07-05 14:21:28 +03:00