Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop #1867

Merged
merged 117 commits into from
Jan 10, 2020
Merged

Merge master into develop #1867

merged 117 commits into from
Jan 10, 2020

Conversation

sdispater
Copy link
Member

Pull Request Check List

  • Added tests for changed code.
  • Updated documentation for changed code.

This PR updates the develop branch, which was outdated, with the latest changes from master.

jstacoder and others added 30 commits April 17, 2019 00:00
Co-Authored-By: Géry Ogam <[email protected]>
Previously, the mtime was the default value of 0.

Fixes #670.

This stops the following warning when using gnu tar:
implausibly old time stamp 1970-01-01 01:00:00
* Improve the InstalledRepository class

* Improve support for git dependencies
replace deprecated GPL identifiers with their new version
Fix "support for support" mistake at changelog
frostming and others added 24 commits December 24, 2019 16:25
I need to pin a dependency to a specific git commit hash. After reading
these docs, it was not clear to me that I could do so with the `rev`
key, because "something else" is vague. I wound up digging into the
source code and learned what I needed there.

This change expands the documentation for `git` dependencies to explain
the sub-keys in more detail and give examples of how to use each.
Expand documentation of `git` dependency subkeys
* Fix PEP440 compatible release (`~=`) handling

PEP440 compatible release version range (`~=`) should have itself as a minimum
value. Examples from [official
doc](https://python.org/dev/peps/pep-0440/#compatible-release) (each pair is
equivalent):

```
~=2.2
>=2.2, ==2.*

~=1.4.5
>=1.4.5, ==1.4.*

~=2.2.post3
>=2.2.post3, ==2.*

~=1.4.5a4
>=1.4.5a4, ==1.4.*
```

In every case, lower bound is exactly same as the input version. Current
incorrect behavior was originally introduced 2 years ago by commit c55d55a,
where it tried to reset patch version to 0 for tilde expression.

Closes #1150.

* Fix Black lint
* fix: removed hint for uninstall poetry, after installation.

* change (get-poetry.py): changed hint about uninstalling poetry

* fix (get-poetry.py): typo
…1592)

* Handle nested wildcards in package includes correctly. Fixes: #1379.

Use compat `Path`.

* Ensure that when building sdists, subpackages with Python files (but not necessarily an __init__.py file) will be included.
Update the contributing instructions to use python-poetry instead of sdispater as the repository namespace.
* fix(exporter): don't export local file dependency as editable

* fix(exporter): don't check for source_type "url" when prepending `-e`
* change (env.py): force recreation of venv if it is not sane

* new (env): add warning when forcing recreation

* fix (env): warning about broken venv placed right before calling recreation

* Update poetry/utils/env.py

Co-Authored-By: Sébastien Eustace <[email protected]>

Co-authored-by: Sébastien Eustace <[email protected]>
…ndencies (#1796)

* fix (directory_dependency, file_dependency): create PEP508 compliant dependency string for directory and file dependencies

* fix (directory_dependency, file_dependency): making isort and black happy
# Conflicts:
#	poetry/masonry/builders/builder.py
#	poetry/masonry/builders/wheel.py
#	tests/masonry/builders/fixtures/default_with_excluded_data_toml/pyproject.toml
#	tests/masonry/builders/fixtures/exclude_nested_data_toml/pyproject.toml
#	tests/masonry/builders/test_wheel.py
@sdispater sdispater requested a review from a team January 10, 2020 15:14
@sdispater sdispater merged commit f797e17 into develop Jan 10, 2020
@sdispater sdispater deleted the merge-master-into-develop branch January 10, 2020 17:04
Copy link

github-actions bot commented Mar 1, 2024

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.