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 #2209

Merged
merged 50 commits into from
Mar 20, 2020
Merged

Merge master into develop #2209

merged 50 commits into from
Mar 20, 2020

Conversation

sdispater
Copy link
Member

Updating the develop branch with the latest changes made on master

sdispater and others added 30 commits January 17, 2020 18:03
Documentation: Fix `build` command
…nal list of requirements for building a package, not listed in `pyproject.toml` and not dependencies for the package itself (#1875)

fix (tests): adopted tests
…parsing (#1902 (#1913)

* fix (git): match for `\w` instead of `.` for getting user

* change (vcs.git): hold pattern of the regex parts in a dictionary to be consistent over all regexs

* new (vcs.git): test for `parse_url` and some fixes for the regex pattern

* new (vcs.git): test for `parse_url` with string that should fail

* fix (test.vcs.git): make flake8 happy
The previous regexp was only taking the first integer of the version number,
this presented problems when the major version number reached double digits.

Poetry would determine that the version of the dependency is '1', rather than,
ie: '14'. This caused failures to solve versions.
# Conflicts:
#	poetry/utils/password_manager.py
* fix downloading packages from simplepypi

* unused code removed

* remove unused imports
RFC 3986 § 2.3 permits more characters in a URL than were matched. This
corrects that, though there may be other deficiencies. This was a
regression from v1.0.2, where at least “.” was matched without error.
Currently the note in "Updating Poetry" is different from the one below in "Enable tab completion for Bash, Fish, or Zsh". This MR is to make them more consistent.
Update README.md "Updating Poetry"
init: change dev dependency prompt
* fix(git): have annotated tags resolve to the commit sha

* fix(git): fix quote

* fix(git): change to rev-parse
* Fix #1791: Load repository URL from config

* Ran black to fix linting errors

* Add test for repo URL env variable
* Add support for forward slashes and url encoding in credentials

* Remove extra newline

* Remove unquote
* Update release.yml

* Update main.yml
* Fix vendor package as installed package (#1883)

* import from

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

* test vendor package as installed

* refactor

* remove blank line

Co-authored-by: Sébastien Eustace <[email protected]>
* fix(utils.env): import cli_run from virtualenv if create_environment import failes

* fix (utils.env): added accidentally removed code
Frost Ming and others added 20 commits February 28, 2020 14:31
* list .venv when it exists

* only list when in-project is true

* missing config

* move logic to manager.list

* Add .venv when it exists
…1009) (#1626)

* fix: exclude subpackage from `setup.py` if `__init__.py` is excluded

Fixes: #1009

* fix: added missing test data

* fix: lint test data

* change (sdist.git): exclude folders with no python file

* fix (sdist.git): make black happy
…1946) (#1947)

* fix (builder): take `self._original_path` if available to find `.git` folder

* change (vcs): use `git rev-parse --show-toplevel` to find git root folder

* fix (vcs): change back to original working dir after finding vcs

* change (builder): introduce self._original_path to keep original path
if(vcs): resolve directory for `get_vcs`
* Fix accented characters not being matched in author name

Fixes #2004

* Normalized the strings instead of modifying the pattern

* Applied isort & black
* Update release script

* Bump version to 1.0.4
Fix VCS when git is not in PATH
Black is now officially supported by the Python Software Foundation
Update managing-environments.md
# Conflicts:
#	CHANGELOG.md
#	poetry.lock
#	poetry/__version__.py
#	pyproject.toml
@sdispater sdispater merged commit 8224b16 into develop Mar 20, 2020
@sdispater sdispater deleted the merge-master-into-develop branch March 20, 2020 13:30
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.