Skip to content

Commit

Permalink
Merge pull request #272 from openedx/tcril/fix-gh-org-url
Browse files Browse the repository at this point in the history
Fix github url strings (org edx -> openedx)
  • Loading branch information
sarina committed Sep 16, 2022
2 parents 42daf1c + 69b39fc commit 2dc0a5a
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
commitlint:
uses: edx/.github/.github/workflows/commitlint.yml@master
uses: openedx/.github/.github/workflows/commitlint.yml@master
77 changes: 18 additions & 59 deletions .github/workflows/upgrade-python-requirements.yml
Original file line number Diff line number Diff line change
@@ -1,68 +1,27 @@
name: Upgrade Requirements
name: Upgrade Python Requirements

on:
schedule:
# will start the job at midnight every tuesday (UTC)
- cron: "0 1 * * 2"
- cron: "0 0 * * 1"
workflow_dispatch:
inputs:
branch:
description: "Target branch to create requirements PR against"
description: "Target branch against which to create requirements PR"
required: true
default: 'master'
default: '$default-branch'

jobs:
upgrade_requirements:
runs-on: ubuntu-20.04

strategy:
matrix:
python-version: ["3.8"]

steps:
- name: setup target branch
run: echo "target_branch=$(if ['${{ github.event.inputs.branch }}' = '']; then echo 'master'; else echo '${{ github.event.inputs.branch }}'; fi)" >> $GITHUB_ENV

- uses: actions/checkout@v1
with:
ref: ${{ env.target_branch }}

- name: setup python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: make upgrade
run: |
cd $GITHUB_WORKSPACE
make upgrade
- name: setup testeng-ci
run: |
git clone https://github.com/edx/testeng-ci.git
cd $GITHUB_WORKSPACE/testeng-ci
pip install -r requirements/base.txt
- name: create pull request
env:
GITHUB_TOKEN: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}
GITHUB_USER_EMAIL: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}
run: |
cd $GITHUB_WORKSPACE/testeng-ci
python -m jenkins.pull_request_creator --repo-root=$GITHUB_WORKSPACE \
--target-branch="${{ env.target_branch }}" --base-branch-name="upgrade-python-requirements" \
--commit-message="chore: Updating Python Requirements" --pr-title="Python Requirements Update" \
--pr-body="Python requirements update.Please review the [changelogs](https://openedx.atlassian.net/wiki/spaces/TE/pages/1001521320/Python+Package+Changelogs) for the upgraded packages." \
--user-reviewers="" --team-reviewers="arbi-bom" --delete-old-pull-requests
- name: Send failure notification
if: ${{ failure() }}
uses: dawidd6/action-send-mail@v3
with:
server_address: email-smtp.us-east-1.amazonaws.com
server_port: 465
username: ${{secrets.EDX_SMTP_USERNAME}}
password: ${{secrets.EDX_SMTP_PASSWORD}}
subject: Upgrade python requirements workflow failed in ${{github.repository}}
to: arbi-bom@edx.org
from: github-actions <github-actions@edx.org>
body: Upgrade python requirements workflow in ${{github.repository}} failed! For details see "github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
call-upgrade-python-requirements-workflow:
uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
with:
branch: ${{ github.event.inputs.branch || '$default-branch' }}
# optional parameters below; fill in if you'd like github or email notifications
# user_reviewers: ""
# team_reviewers: ""
# email_address: ""
# send_success_notification: false
secrets:
requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}
requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}
edx_smtp_username: ${{ secrets.EDX_SMTP_USERNAME }}
edx_smtp_password: ${{ secrets.EDX_SMTP_PASSWORD }}
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ and publishing Courses. In the future the scope and responsibilty of the
Organization may evolve to include other aspects, such as related
learners.

.. |Build Status| image:: https://github.com/edx/edx-organizations/workflows/Python%20CI/badge.svg?branch=master
:target: https://github.com/edx/edx-organizations/actions?query=workflow%3A%22Python+CI%22
.. |Build Status| image:: https://github.com/openedx/edx-organizations/workflows/Python%20CI/badge.svg?branch=master
:target: https://github.com/openedx/edx-organizations/actions?query=workflow%3A%22Python+CI%22
.. |Coverage Status| image:: https://coveralls.io/repos/github/edx/edx-organizations/badge.svg?branch=master
:target: https://coveralls.io/github/edx/edx-organizations?branch=master

Expand Down Expand Up @@ -52,7 +52,7 @@ work-in-progress and is changing frequently at this time.
See our `CONTRIBUTING`_ file for more information – it also contains guidelines for how to
maintain high code quality, which will make your contribution more likely to be accepted.

.. _CONTRIBUTING: https://github.com/edx/edx-platform/blob/master/CONTRIBUTING.rst
.. _CONTRIBUTING: https://github.com/openedx/edx-platform/blob/master/CONTRIBUTING.rst

Reporting Security Issues
-------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ the lack of breaking changes.

These changes will be made in `pull request 137`_.

.. _pull request 137: https://github.com/edx/edx-organizations/pull/137
.. _pull request 137: https://github.com/openedx/edx-organizations/pull/137

After one edx-platform release, Version 6.0.0 of this package can be released,
which would remove the now-unnecessary check for ``FEATURES["ORGANIZATIONS_APP"]``.
Expand Down Expand Up @@ -176,7 +176,7 @@ references will be updated to use ``organizations.api`` directly.

These changes will be made in `pull request 25153`_.

.. _pull request 25153: https://github.com/edx/edx-platform/pull/25153
.. _pull request 25153: https://github.com/openedx/edx-platform/pull/25153

Community
~~~~~~~~~
Expand All @@ -198,7 +198,7 @@ For edx.org and stage.edx.org, the ``FEATURES["ORGANIATIONS_APP"] = True``
overrides will be updated to be ``ORGANIZATIONS_AUTOCREATE = False``
in `pull request 3456`_.

.. _pull request 3456: https://github.com/edx/edx-internal/pull/3456
.. _pull request 3456: https://github.com/openedx/edx/pull/3456

See also
--------
Expand Down
8 changes: 4 additions & 4 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# ** DO NOT EDIT THIS FILE **
# ***************************
#
# This file was generated by edx-lint: https://github.com/edx/edx-lint
# This file was generated by edx-lint: https://github.com/openedx/edx-lint
#
# If you want to change this file, you have two choices, depending on whether
# you want to make a local change that applies only to this repo, or whether
Expand All @@ -28,7 +28,7 @@
# CENTRAL CHANGE:
#
# 1. Edit the pylintrc file in the edx-lint repo at
# https://github.com/edx/edx-lint/blob/master/edx_lint/files/pylintrc
# https://github.com/openedx/edx-lint/blob/master/edx_lint/files/pylintrc
#
# 2. install the updated version of edx-lint (in edx-lint):
#
Expand Down Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.2.4
# Generated by edx-lint version: 5.3.0
# ------------------------------
[MASTER]
ignore = ,migrations, wsgi.py
Expand Down Expand Up @@ -382,4 +382,4 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = Exception

# b4e68b945b9543b5e519e02f684e618f5fbf979c
# 548b6add592cd536f103a388bf7c72480b7148a6
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def get_version(*file_paths):
description='Organization management module for Open edX',
long_description=open('README.rst').read(),
author='edX',
url='https://github.com/edx/edx-organizations',
url='https://github.com/openedx/edx-organizations',
license='AGPL',
classifiers=[
'Development Status :: 5 - Production/Stable',
Expand Down

0 comments on commit 2dc0a5a

Please sign in to comment.