upstream/mercurial-mirror Files · contrib/automation/hgautomation/pypi.py

filemerge: when merge tool uses $output, don't leave markers in $local...

filemerge: when merge tool uses $output, don't leave markers in $local As explained in the previous patch, we incorrectly leave conflict markers in both `$local` and `$output` since D12190. I don't understand why it broke but the fix is simple and clear after all the recent refactoring. Differential Revision: https://phab.mercurial-scm.org/D12379

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r49823:a54a8663

stable

Download file

             pypi.py
        
                    21 lines
            
             | 551 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / automation / hgautomation / pypi.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # pypi.py - Automation around PyPI

      #

      # Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      # no-check-code because Python 3 native.

      from twine.commands.upload import upload as twine_upload

      from twine.settings import Settings

      def upload(paths):

          """Upload files to PyPI.

          `paths` is an iterable of `pathlib.Path`.

          """

          settings = Settings()

          twine_upload(settings, [str(p) for p in paths])

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# pypi.py - Automation around PyPI
				#
				# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				# no-check-code because Python 3 native.

				from twine.commands.upload import upload as twine_upload
				from twine.settings import Settings


				def upload(paths):
				"""Upload files to PyPI.

				`paths` is an iterable of `pathlib.Path`.
				"""
				settings = Settings()

				twine_upload(settings, [str(p) for p in paths])