search

collective / collective.recipe.solrinstance

Buildout recipe to configure a Solr instance
https://pypi.python.org/pypi/collective.recipe.solrinstance
5 stars 13 forks source link

Fix duplicate <dataDir> in 'solrconfig.xml' for Solr 4.5.0. #25

Closed paparomeo closed 11 years ago

paparomeo commented 11 years ago

Solr 4.5.0 is stricter when parsing 'solrconfig.xml' and will fail to start due to duplicate nodes in the file: fix that.

Also explicitly declare the template files as package data, since when installing directly from a tarball with 'pip', the template files weren't being installed.

davidjb commented 11 years ago

For the missing templates in the installation, is it that they're being missed from being included in a tar.gz distribution or that pip isn't installing them even if they are present? If it's the former, then using setuptools-git would resolve that -- seems there's a lot of issues about regarding sdist/bdist and package data.

paparomeo commented 11 years ago

My use case was installing from the .tar.gz generated automatically by GitHub from a commit. From that .tar.gz, neither pip nor buildout would install the templates. Once you release a new version of the package this will probably become a non-issue, so please feel free to cherry pick @d62e42a only.

davidjb commented 11 years ago

Okay, using setuptools-git in that case will resolve that issue and will include all versioned files into dists. Cherry-picked the other commit too. Thanks!

davidjb commented 11 years ago

In my tests, my git-based sdists include the relevant files correctly, but if you could just double check it works for you with pip installation, that'd be great.

paparomeo commented 11 years ago

Sorry for the late reply. It seems that my use case, of installing from the automatically generated tarball for a commit, still doesn't include the templates, even with the inclusion of setuptools-git. This happens for both pip and buildout, e.g.:

pip install https://github.com/collective/collective.recipe.solrinstance/tarball/507cdf8feb/collective.recipe.solrinstance-5.2.dev0.tar.gz

My specific use case is putting links like:

https://github.com/collective/collective.recipe.solrinstance/tarball/507cdf8feb/collective.recipe.solrinstance-5.2.dev0.tar.gz

in the find-links of my buildout, to be able to include unreleased versions of packages in the buildout.

I believe it's a useful use case and it would be brilliant if you supported it upstream.

davidjb commented 11 years ago

Ah, I see now. Because you're using a non-dist tarball, the egg-info isn't present within the tarball to tell setuptools what sources to install.

I've cherry-picked your initial commit - should be fine to work in this manner now.

paparomeo commented 11 years ago

Yes, that's it of course: the missing egg-info in the automatically generated tarball. Thank you David!