Commit Graph

3625 Commits

Author SHA1 Message Date
kennethreitz 546be007cf Merge pull request #1807 from jtratner/check-warehouse-pypi-org
Still check warehouse API for new pypi.org
2018-03-20 17:14:30 -04:00
kennethreitz fea515137f Merge pull request #1803 from paraschas/master
remove --update option from the documentation
2018-03-20 17:14:12 -04:00
kennethreitz 1b071bb63b Merge pull request #1808 from pypa/bugfix/resolver-markers
Simplify marker checks in patched resolver
2018-03-20 17:13:04 -04:00
Tzu-ping Chung 2b84ab6fd1 Merge pull request #1809 from jtratner/fix-inject-env-vars
Fix environment variable expansion with extras
2018-03-21 04:49:27 +08:00
Jeff Tratner 13070ac974 Fix environment variable expansion with extras 2018-03-20 10:50:53 -07:00
Jeff Tratner ff03d7d32a Still check warehouse API for new pypi 2018-03-20 09:04:00 -07:00
Dan Ryan e433ebbac2 Simplify marker checks in patched resolver
- Fix Overlapping naming checking for inner markers
- Perform a first-pass right-side split of markers and remove other
exact matching markers from the dependency string
- Fixes #1617, #1791, #1805, #1622
2018-03-20 11:30:37 -04:00
Dimitrios Paraschas 5f363a894c remove --update option from the documentation 2018-03-20 15:16:05 +02:00
kennethreitz 913713e9dc history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-20 08:22:40 -04:00
kennethreitz 57aecc3b4b history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-20 08:22:23 -04:00
kennethreitz dfb6dd470d Merge pull request #1754 from jtratner/cache-parsed-pipfile
Cache parsed pipfile
2018-03-20 08:21:24 -04:00
kennethreitz e8e38d7929 Merge pull request #1769 from dvf/dvf/parse-environment-variables
Allow values in Pipfile to consume Environment Variables
2018-03-20 08:16:31 -04:00
kennethreitz 30df6b1efc Merge pull request #1793 from jtratner/add-git-to-dockerfile
Add git to Dockerfile for git installs
2018-03-20 08:13:54 -04:00
kennethreitz d067f8b2a7 Merge pull request #1797 from pypa/bugfix/resolver-markers
Fix resolving against multiple markers
2018-03-20 08:13:19 -04:00
Dan Ryan 240107b5cf Fix resolving against multiple markers
- Fix for when requirements are also present
- Fixes #1791
2018-03-19 17:03:42 -04:00
kennethreitz b9894ced7e Merge pull request #1795 from pypa/diagnose-doc
Add a page to answer common questions
2018-03-19 16:01:55 -04:00
Tzu-ping Chung fed9569f9a Add faq page 2018-03-20 02:13:15 +08:00
Jeff Tratner 3b88bf9dae Add git to Dockerfile for git installs 2018-03-19 10:00:49 -07:00
Jeff Tratner 8a086f175a Stop using a threading.local 2018-03-19 09:57:47 -07:00
Jeff Tratner 3925f7a537 Do not bother hashing 2018-03-19 09:53:41 -07:00
Jeff Tratner dfb1a19dcf Clear pipfile cache when it seems like we might be mutating 2018-03-19 09:53:41 -07:00
Jeff Tratner bde5bb35c7 Apparently you cannot deepcopy TOMLFile objects
Weirdly (seems like) it only fails in test suite but not in actual
usage, but manual vetting suggests we don't modify the pipfile without
writing it to disk pretty much immediately.
2018-03-19 09:53:41 -07:00
Jeff Tratner 511561122b Cache pipfile parsing
On a (390+ line) Pipfile, it takes ~5s to parse the entire thing :O.
Pipenv has to parse the pipfile repeatedly and all over the place, so
caching the contents speeds things up dramatically (at least in this
case).

This PR establishes a little cache based upon file location + md5sum of
contents for the pipfile (and the hashing is pretty fast here). Given
that the cache key is based on the file contents, should be completely
fine to do (only possible issue is if parsed_pipfile gets mutated -
which is why I've added a defensive deepcopy).

Without the deepcopy, cache hit takes ~0.09ms.
With the deepcopy, cache hit takes 1.19ms.

If we can confirm no need for deepcopy, would shave off a second or two
off really big Pipfiles.
2018-03-19 09:53:41 -07:00
kennethreitz 0760cf0a9c attempt
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v11.8.3
2018-03-19 08:19:42 -04:00
kennethreitz 5aeab06b2c attempt to fix #1738
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 08:17:29 -04:00
kennethreitz c4ccc2292c allow_prereleases
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 06:54:02 -04:00
kennethreitz a0606e43e3 remove easter egg 2018-03-19 06:51:51 -04:00
kennethreitz 2bba03f973 pipenv --update
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 06:47:32 -04:00
kennethreitz 4c51214e7e remove --update
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 06:46:10 -04:00
kennethreitz c52300a5ca history / version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v11.8.2
2018-03-19 06:24:49 -04:00
kennethreitz 97e91527e0 Merge pull request #1774 from asherf/jerry
fix prepare_pip_source_args not properly handle user & pw in repo URLs
2018-03-19 06:21:07 -04:00
kennethreitz ed13dc48b5 new lockfile
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 06:18:34 -04:00
kennethreitz 1ea3a3f7cb pipfile
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 06:16:27 -04:00
kennethreitz 3ccb899a57 3.6
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 06:16:16 -04:00
kennethreitz da9331e148 Merge pull request #1768 from jtratner/fix-white-marker
Make white only for python 3 dev-packages
2018-03-19 06:15:43 -04:00
kennethreitz 23fa279894 Merge pull request #1751 from giuscri/reorder-install-requires
Reorder dependencies passed to setuptools's setup
2018-03-19 06:13:59 -04:00
kennethreitz 2fc1b8f74a Merge pull request #1771 from ksonj/master
Remove recommendation to add `passenv=HOME` in tox.ini
2018-03-19 06:13:39 -04:00
kennethreitz ca6551776e Merge pull request #1758 from uranusjr/more-robust-resolver-sys-path
Improve resolver path-patching
2018-03-19 06:12:24 -04:00
kennethreitz 2977d30b37 Merge pull request #1777 from puzan/fix_clear
Pass clear flag to resolver
2018-03-19 06:11:50 -04:00
kennethreitz a83e3ab88d Merge pull request #1778 from giuscri/pipfile-many-newlines
better cleanup_toml
2018-03-19 06:11:31 -04:00
kennethreitz b398cc93af Merge branch 'master' into pipfile-many-newlines 2018-03-19 06:11:04 -04:00
kennethreitz e6bf8313d9 Merge pull request #1772 from Hrxn/patch-2
Fix typo in README.rst
2018-03-19 06:10:35 -04:00
Giuseppe 1fca77f9b3 reorder dependencies passed to setuptools's setup
workaround for https://github.com/pypa/setuptools/issues/498
2018-03-18 13:28:23 +01:00
Giuseppe 68419d2328 better cleanup_toml
Before this commit Pipfile had a more
than neeeded newlines between sections.
2018-03-18 13:18:45 +01:00
Ilya Zonov 1318261fc2 Clear cache only once 2018-03-18 13:45:38 +03:00
Ilya Zonov b356c581b1 Pass clear flag to resolver 2018-03-18 13:22:41 +03:00
Asher Foa 31581b3f0c fix prepare_pip_source_args not properly handle user & pw in repo URLs 2018-03-17 16:25:44 -07:00
HRXN 7098621ea3 Fix typo in README.rst
use -> you
2018-03-17 21:24:25 +01:00
Kalle Jepsen 72bbd6206a Remove recommendation to add passenv=HOME to tox.ini
I believe `passenv=HOME` is no (or no longer?) necessary, as pipenv will
use the virtualenv it is running in. In addition this adds a
recommendation to add `--ignore-pipfile` to `pipenv install`, to protect
the locked dependency set from accidental changes.
2018-03-17 20:35:14 +01:00
Tzu-ping Chung 0d0d7e35b3 Improve resolver path-patching
Add the parent site-packages directory to sys.path *after* built-in
ones, and only when it does not already exist.

This should vastly improve the resolver's robustness against hostile
Python environments, such as #1753. It might help with issues like #693
as well, but I'm not sure (and not interested in figuring out either).
2018-03-17 10:08:07 +08:00