Skip to content

Commit c47a5aa

Browse files
committed
Add upperbounds to requirements
[noissue]
1 parent 385726c commit c47a5aa

File tree

12 files changed

+16
-177
lines changed

12 files changed

+16
-177
lines changed
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
bump2version
22
gitpython
3-
python-redmine
43
towncrier

.ci/scripts/check_gettext.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ cd "$(dirname "$(realpath -e "$0")")"/../..
1212

1313
set -uv
1414

15-
# check for imports not from pulpcore.plugin. exclude tests
1615
MATCHES=$(grep -n -r --include \*.py "_(f")
1716

1817
if [ $? -ne 1 ]; then

.ci/scripts/cherrypick.sh

Lines changed: 0 additions & 69 deletions
This file was deleted.

.ci/scripts/redmine.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

.ci/scripts/update_redmine.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-192-gba67a84
1+
2021.08.26-197-g21230dd

.github/workflows/nightly.yml

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- TEST: docs
2727
- TEST: azure
2828
- TEST: s3
29+
2930
- TEST: generate-bindings
3031
- TEST: lowerbounds
3132

@@ -311,32 +312,6 @@ jobs:
311312
SECRETS_CONTEXT: ${{ toJson(secrets) }}
312313

313314

314-
- name: Download Ruby client
315-
uses: actions/download-artifact@v3
316-
with:
317-
name: ruby-client.tar
318-
319-
- name: Untar Ruby client packages
320-
run: tar -xvf ruby-client.tar
321-
322-
- name: Publish client to rubygems
323-
run: bash .github/workflows/scripts/publish_client_gem.sh
324-
325-
326-
327-
- name: Download Python client
328-
uses: actions/download-artifact@v3
329-
with:
330-
name: python-client.tar
331-
332-
- name: Untar python client packages
333-
run: tar -xvf python-client.tar
334-
335-
- name: Publish client to pypi
336-
run: bash .github/workflows/scripts/publish_client_pypi.sh
337-
338-
339-
340315
- name: Download built docs
341316
uses: actions/download-artifact@v3
342317
with:

.github/workflows/release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Install python dependencies
4444
run: |
4545
echo ::group::PYDEPS
46-
pip install packaging~=21.3 bandersnatch bump2version gitpython python-redmine towncrier==19.9.0 wheel
46+
pip install packaging~=21.3 bandersnatch bump2version gitpython towncrier==19.9.0 wheel
4747
echo ::endgroup::
4848
4949
- name: Configure Git with pulpbot name and email
@@ -293,7 +293,7 @@ jobs:
293293
- name: Install python dependencies
294294
run: |
295295
echo ::group::PYDEPS
296-
pip install gitpython python-redmine requests packaging~=21.3 tweepy
296+
pip install gitpython requests packaging~=21.3 tweepy
297297
echo ::endgroup::
298298
299299
- name: Push branch and tag to GitHub
@@ -335,8 +335,6 @@ jobs:
335335
- name: Publish client to rubygems
336336
run: bash .github/workflows/scripts/publish_client_gem.sh
337337

338-
339-
340338
- name: Update GitHub
341339
continue-on-error: true
342340
run: |

.github/workflows/scripts/before_install.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,18 @@ if [ -n "$PULP_OPENAPI_GENERATOR_PR_NUMBER" ]; then
9393
fi
9494

9595

96-
git clone --depth=1 https://github.com/pulp/pulp-cli.git
96+
git clone https://github.com/pulp/pulp-cli.git
97+
cd pulp-cli
9798
if [ -n "$PULP_CLI_PR_NUMBER" ]; then
98-
cd pulp-cli
9999
git fetch origin pull/$PULP_CLI_PR_NUMBER/head:$PULP_CLI_PR_NUMBER
100100
git checkout $PULP_CLI_PR_NUMBER
101-
cd ..
101+
pip install . ./pulp-glue
102+
else
103+
pip install pulp-cli
104+
PULP_CLI_VERSION="$(python -c "from pulpcore.cli.common import __version__; print(__version__)")"
105+
git checkout "$PULP_CLI_VERSION"
102106
fi
103107

104-
cd pulp-cli
105-
pip install .
106108
pulp config create --base-url https://pulp --location tests/cli.toml
107109
mkdir ~/.config/pulp
108110
cp tests/cli.toml ~/.config/pulp/cli.toml

.github/workflows/scripts/release.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ def create_release_commits(repo, release_version, plugin_path):
7979
git.add(f"{plugin_path}/setup.py")
8080
git.add(f"{plugin_path}/requirements.txt")
8181
git.add(f"{plugin_path}/.bumpversion.cfg")
82-
8382
git.commit("-m", f"Release {release_version}\nGH Issues: {issues}\n\n[noissue]")
84-
8583
sha = repo.head.object.hexsha
8684
short_sha = git.rev_parse(sha, short=7)
8785

@@ -101,7 +99,6 @@ def create_release_commits(repo, release_version, plugin_path):
10199
git.add(f"{plugin_path}/requirements.txt")
102100
git.add(f"{plugin_path}/.bumpversion.cfg")
103101
git.commit("-m", f"Bump to {new_dev_version}\n\n[noissue]")
104-
105102
print(f"Release commit == {short_sha}")
106103
print(f"All changes were committed on branch: release_{release_version}")
107104
return sha

0 commit comments

Comments
 (0)