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

Merged
merged 125 commits into from
Jun 9, 2020
Merged

Merge master into develop #2509

merged 125 commits into from
Jun 9, 2020

Conversation

sdispater
Copy link
Member

This makes develop up-to-date with the latest fixes from 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 <sebastien.eustace@gmail.com>

* test vendor package as installed

* refactor

* remove blank line

Co-authored-by: Sébastien Eustace <sebastien.eustace@gmail.com>
* fix(utils.env): import cli_run from virtualenv if create_environment import failes

* fix (utils.env): added accidentally removed code
# Conflicts:
#	CHANGELOG.md
#	poetry/__version__.py
#	poetry/installation/pip_installer.py
#	poetry/masonry/builders/editable.py
#	pyproject.toml
#	tests/masonry/builders/test_editable.py
@sdispater sdispater changed the base branch from master to develop June 5, 2020 22:37
@sdispater sdispater force-pushed the merge-master-into-develop branch 6 times, most recently from f896e6d to f0e4759 Compare June 6, 2020 11:09
wshayes and others added 2 commits June 6, 2020 09:08
Added a cli add git ssh dependency example to documentation for easy reference.
Added git ssh example to docs
@PetterS
Copy link
Contributor

PetterS commented Jun 9, 2020

Would it be possible to stop using the develop branch altogether?

Then master always contains the latest functionality. Bug fixes are commited to master and then cherry-picked to branches called e.g. 1.0 (from which 1.0.x releases are made). When a new major or minor release is made, a new branch is created. Alpha releases are made from master.

Right now, if one wants to use the latest Poetry functionality, one has to manually merge the two branches into a temp branch. This is cumbersome. Better IMO if master always contains the latest and greatest.

Fix wrong indentation in mixology
…-legacy-repositories-packages

Fix legacy repositories packages being continuously updated
# Conflicts:
#	CHANGELOG.md
#	poetry/__version__.py
#	poetry/packages/dependency.py
#	poetry/version/markers.py
#	pyproject.toml
#	tests/packages/test_dependency.py
#	tests/packages/test_main.py
@sdispater
Copy link
Member Author

@PetterS We plan on changing the development workflow once the 1.1 version is released.

@sdispater sdispater merged commit d4be652 into develop Jun 9, 2020
@sdispater sdispater deleted the merge-master-into-develop branch June 9, 2020 20:49
@PetterS
Copy link
Contributor

PetterS commented Jun 11, 2020

Sounds good. Really looking forward to 1.1 – have had several issues internally that would have been resolved with --remove-untracked.

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.