Skip to content

Instantly share code, notes, and snippets.

setuptools master $ git diff
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2e5ad4bd..987d684e 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -728,6 +728,10 @@ class Distribution(_Distribution):
if self.features:
self._set_global_opts_from_features()
+ hook_key = 'setuptools.finalize_distribution_options'
// Future versions of Hyper may add additional config options,
// which will not automatically be merged into this file.
// See https://hyper.is#cfg for all currently supported options.
module.exports = {
config: {
// choose either `'stable'` for receiving highly polished,
// or `'canary'` for less polished but more frequent updates
updateChannel: 'stable',
import cherrypy
@cherrypy.tools.register('before_finalize', priority=60)
def noisy_hook_1():
raise ValueError('hook 1 failed')
@cherrypy.tools.register('before_finalize', priority=60)
def noisy_hook_2():
$ pip-run -q 'setuptools<34.4' -- -m easy_install configparser
Searching for configparser
Reading https://pypi.python.org/simple/configparser/
Downloading https://files.pythonhosted.org/packages/b1/83/fa54eee6643ffb30ab5a5bebdb523c697363658e46b85729e3d587a3765e/configparser-3.8.1.tar.gz#sha256=bc37850f0cc42a1725a796ef7d92690651bf1af37d744cc63161dac62cabee17
Best match: configparser 3.8.1
Processing configparser-3.8.1.tar.gz
Writing /var/folders/c6/v7hnmq453xb6p2dbz1gqc6rr0000gn/T/easy_install-rkvtnjl2/configparser-3.8.1/setup.cfg
Running configparser-3.8.1/setup.py -q bdist_egg --dist-dir /var/folders/c6/v7hnmq453xb6p2dbz1gqc6rr0000gn/T/easy_install-rkvtnjl2/configparser-3.8.1/egg-dist-tmp-g2k9nrhy
file src/c.py (for module c) not found
file src/o.py (for module o) not found
skeleton master $ git merge --no-commit upstream/master
Auto-merging tox.ini
Auto-merging skeleton.md
CONFLICT (content): Merge conflict in skeleton.md
Auto-merging setup.cfg
CONFLICT (content): Merge conflict in setup.cfg
Auto-merging pytest.ini
CONFLICT (content): Merge conflict in pytest.ini
CONFLICT (modify/delete): pin-pip.py deleted in upstream/master and modified in HEAD. Version HEAD of pin-pip.py left in tree.
Auto-merging docs/conf.py
import operator
import itertools
def pairwise(iterable):
orig, copy = itertools.tee(iterable)
next(copy)
return zip(orig, copy)
# coding: future_fstrings
__requires__ = [
'cherrypy!=18.1.0',
'future-fstrings',
'backports.functools_lru_cache; python_version=="2.7"',
]
import logging
try:
import logging
import cherrypy.lib.cpstats
class CherootStatistics(cherrypy.process.plugins.SimplePlugin):
def main(self):
self.bus.log('Enabling Cheroot statistics')
keys = (
key
__requires__ = ['pymongo']
__index_url__ = 'https://m.devpi.net/jaraco/dev'
import datetime
import decimal
import pymongo
import bson.codec_options as opts
from bson import decimal128
__requires__ = ['pymongo']
__index_url__ = 'https://m.devpi.net/jaraco/dev'
import datetime
import decimal
import pymongo
import bson.codec_options as opts
from bson import decimal128