8000 Remove cherry-picker from core-workflow. by Mariatta · Pull Request #330 · python/core-workflow · GitHub
[go: up one dir, main page]
Skip to content

8000 Remove cherry-picker from core-workflow. #330

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jun 5, 2019
Merged

Remove cherry-picker from core-workflow. #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a3e6ad
Remove cherry-picker from core-workflow.
Mariatta May 30, 2019
6c2bd38
Update README.rst
Mariatta Jun 4, 2019
a2226d0
Remove the cherry_picker directory
Mariatta Jun 5, 2019
fda9786
Remove cherry-picker from travis.yml
Mariatta Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 3 additions & 74 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,73 +9,28 @@ dist: trusty
cache: pip

before_install:
- &install-flit >-
pip install --upgrade pip flit
- pip install --upgrade pip flit

.mixtures:
- &run-if-tagged
if: tag IS present
- &run-if-cherry-picker
if: tag =~ ^cherry\-picker\-v\d+\.\d+\.\d+$
- &run-if-blurb
if: tag =~ ^blurb\-v\d+\.\d+\.\d+$
- &run-if-cherry-picker-or-untagged
if: tag IS NOT present OR tag =~ ^cherry\-picker\-v\d+\.\d+\.\d+$
- &run-if-blurb-or-untagged
if: tag IS NOT present OR tag =~ ^blurb\-v\d+\.\d+\.\d+$
- &base-3_7
dist: xenial
python: "3.7"
- &install-and-test-cherry-picker
<<: *run-if-cherry-picker-or-untagged
env:
TARGET_PKG: cherry_picker
install:
- &cd-to-project pushd "$TARGET_PKG"
- flit install
script:
- pytest cherry_picker/test.py -v
- popd
- &install-and-test-blurb
<<: *run-if-blurb-or-untagged
env:
TARGET_PKG: blurb
install:
- *cd-to-project
- &cd-to-project pushd "$TARGET_PKG"
- flit install
- popd
script:
- blurb test
- &deploy-base
stage: Publish dists to PYPI
<<: *run-if-tagged
python: "3.6"
install:
- *cd-to-project
script:
- flit build
before_deploy:
# Add an empty setup.py stub, because pypi provider always calls it
- touch setup.py
deploy: &deployment-config
provider: pypi
# `skip-cleanup: true` is required to preserve binary wheel and sdist,
# built by during `install` step above.
skip-cleanup: true
# `skip-existing: true` is required to skip uploading dists, already
# present in PyPI instead of failing the whole process.
# This happenes when other CI (AppVeyor etc.) has already uploaded
# the very same dist (usually sdist).
skip-existing: true
user: &pypi-user core-workflow
password: &pypi-password
# Encrypt with `travis encrypt -r python/core-workflow --org` while using travis-ci.org;
# change to `travis encrypt -r python/core-workflow --api-endpoint 'https://api.travis-ci.com/'`
# upon switch to __free__ travis-ci.com:
secure: "bg1ZOOHlhaT+S3TQy2WpSsWekHaeZSq39kkZj/Ql3nvJ0ES+a+lTjk+gmuSnSX0Sf9V+88TdN5g1frYVcvYWwIQvLEQP2xhqIfq8K+MVe+GbshQGiTD4PC4f7vRcDY+B93X7cQ8HgkGho3c0/BaEaK6MtrS8WK7dIdHCPaea5D8rLF9jXtS2Lt8MYtqRDG1R2BsNN+o87eyr3qD3aJW6cFRPTHPr/x+gmlKuIJcVOwuVd4xyR701xRpE7hK5/bKvQwI2QZhD7wTyJwYqsl3Ce/ZlyS+IINktkFhD2BqH2ya4tdOHeVhA+b44eJEDXUR7gweyO+Ein5W3S3R2lDxHuX3Aq7nJBKHxU39kwcnPPaMRWYKey51d9zbIicmxjj5sLY0vPYmlX1zdbDUK9NqkdRf8aLzyowWFl3DtkXmyoakITOz9boqDIRiivTJQ/mLG8AFKgf0ms/z1yW4/PN+LoomdpmhQj05EfAJdAvdTw+ceteaeBSKc2uDql4Qj5AKUddeaoLQuPbWForfSPosv9DZZmvOXrmncY91HngrdclxFIssMtefQrC2USbQEIedih1cxfsXzwBrX7+f4eHH2MJt/GrOyNB0gaXc4sikYkaBKsIg7UCWC1/F4jmGkyDLlwp31zflZkjPKUJ3vp2SC9R6sHcT04tvxTVIMDCJgkc8="
on:
tags: true
all_branches: true

jobs:
include:
Expand All @@ -88,33 +43,7 @@ jobs:
<<: *install-and-test-blurb
- python: "nightly" # currently, it's 3.8-dev
<<: *install-and-test-blurb

- python: "3.6"
<<: *install-and-test-cherry-picker
- <<: *base-3_7
<<: *install-and-test-cherry-picker
- python: "nightly" # currently, it's 3.8-dev
<<: *install-and-test-cherry-picker
- os: windows
language: sh
python: 3.7
before_install:
- choco install python --version 3.7
- python -m pip install --upgrade pip wheel
- *install-flit
<<: *install-and-test-cherry-picker
env:
PATH: >-
/c/Python37:/c/Python37/Scripts:$PATH
TARGET_PKG: cherry_picker

- <<: *deploy-base
<<: *run-if-cherry-picker
env:
TARGET_PKG: cherry_picker

- <<: *deploy-base
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Mariatta I believe that the deploy base shouldn't have been removed from here. Of course, it doesn't affect anything because auto-deployment hasn't been enabled for blurb. But if anybody will want to use it, they'd have to recover that base mapping.

<<: *run-if-blurb
- <<: *run-if-blurb
if: 1 != 1
env:
TARGET_PKG: blurb
23 changes: 4 additions & 19 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,6 @@ Issue tracker and relevant tools for CPython's workflow
:alt: Python Zulip chat
:target: https://python.zulipchat.com

cherry_picker 🐍 🍒 ⛏
----------------------

.. image:: https://img.shields.io/pypi/pyversions/cherry-picker.svg
:target: https://pypi.org/project/cherry-picker/

.. image:: https://img.shields.io/pypi/v/cherry-picker.svg
:target: https://pypi.org/project/cherry-picker/

.. image:: https://img.shields.io/pypi/l/cherry-picker.svg
:target: https://github.com/python/core-workflow/blob/master/LICENSE/

Utility script for backporting/cherry-picking CPython changes from ``master``
into one of the maintenance branches. See the cherry_picker_
directory for more details.

.. _cherry_picker: https://github.com/python/core-workflow/tree/master/cherry_picker


blurb
-----

Expand All @@ -51,6 +32,9 @@ Other core workflow tools
CPython pull requests.
`python/blurb_it`_ ``blurb add`` on the `GitHub <https://github.com/ `Mariatta`_
web. python/blurb_it/issues>`__
`python/cherry-picker`_ Command line tool for `GitHub <https://github.com/ `Mariatta`_
backporting CPython python/cherry-picker/issues>`__
pull requests.
`python/miss-islington`_ A bot for backporting `GitHub <https://github.com/ `Mariatta`_
CPython pull requests. python/miss-islington/issues>`__
`python/the-knights-who-say-ni`_ CLA enforcement bot for `GitHub <https://github.com/ `Brett Cannon`_
Expand All @@ -68,6 +52,7 @@ Other core workflow tools

.. _`python/bedevere`: https://github.com/python/bedevere
.. _`python/blurb_it`: https://github.com/python/blurb_it
.. _`python/cherry-picker`: https://github.com/python/cherry-picker
.. _`python/miss-islington`: https://github.com/python/miss-islington
.. _`python/the-knights-who-say-ni`: https://github.com/python/the-knights-who-say-ni
.. _`berkerpeksag/cpython-emailer-webhook`: https://github.com/berkerpeksag/cpython-emailer-webhook
Expand Down
2 changes: 0 additions & 2 deletions cherry_picker/cherry_picker/__init__.py
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions cherry_picker/cherry_picker/__main__.py
View file
Open in desktop

This file was deleted.

Loading
0