From 7e7453f6e6a9c597b60a077c5b41ba8f54811f73 Mon Sep 17 00:00:00 2001 From: "Sean P. Goggins" Date: Tue, 20 Feb 2024 14:02:47 -0600 Subject: [PATCH 1/3] API Patch Signed-off-by: Sean P. Goggins --- augur/api/routes/pull_request_reports.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/augur/api/routes/pull_request_reports.py b/augur/api/routes/pull_request_reports.py index 9e6577954..6d05765b7 100644 --- a/augur/api/routes/pull_request_reports.py +++ b/augur/api/routes/pull_request_reports.py @@ -67,10 +67,10 @@ def pull_request_data_collection(repo_id, start_date, end_date): unlabeled_count, head_ref_deleted_count, comment_count, - COALESCE(lines_added, 0), - COALESCE(lines_removed, 0), + COALESCE(lines_added, 0) as lines_added, + COALESCE(lines_removed, 0) as lines_removed, commit_count, - COALESCE(file_count, 0) + COALESCE(file_count, 0) as file_count FROM repo, repo_groups, From 724b6c1fd960fa455eb220786a031ed3319476cd Mon Sep 17 00:00:00 2001 From: "Sean P. Goggins" Date: Tue, 20 Feb 2024 14:13:01 -0600 Subject: [PATCH 2/3] Version Bump for Release Signed-off-by: Sean P. Goggins --- README.md | 4 ++-- docker/backend/Dockerfile | 2 +- docker/database/Dockerfile | 2 +- docker/rabbitmq/Dockerfile | 2 +- metadata.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 13fbe0dca..cc1783821 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Augur NEW Release v0.62.4 +# Augur NEW Release v0.62.5 Augur is primarily a data engineering tool that makes it possible for data scientists to gather open source software community data. Less data carpentry for everyone else! The primary way of looking at Augur data is through [8Knot](https://github.com/oss-aspen/8knot) ... A public instance of 8Knot is available at https://metrix.chaoss.io ... That is tied to a public instance of Augur at https://ai.chaoss.io @@ -10,7 +10,7 @@ The primary way of looking at Augur data is through [8Knot](https://github.com/o ## NEW RELEASE ALERT! ### [If you want to jump right in, updated docker build/compose and bare metal installation instructions are available here](docs/new-install.md) -Augur is now releasing a dramatically improved new version to the main branch. It is also available here: https://github.com/chaoss/augur/releases/tag/v0.62.4 +Augur is now releasing a dramatically improved new version to the main branch. It is also available here: https://github.com/chaoss/augur/releases/tag/v0.62.5 - The `main` branch is a stable version of our new architecture, which features: - Dramatic improvement in the speed of large scale data collection (100,000+ repos). All data is obtained for 100k+ repos within 2 weeks. - A new job management architecture that uses Celery and Redis to manage queues, and enables users to run a Flower job monitoring dashboard diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index ff0787a2c..dc80df737 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -2,7 +2,7 @@ FROM python:3.10-slim-bullseye LABEL maintainer="outdoors@acm.org" -LABEL version="0.62.4" +LABEL version="0.62.5" ENV DEBIAN_FRONTEND=noninteractive diff --git a/docker/database/Dockerfile b/docker/database/Dockerfile index b4bd6fb45..3c0da8aa9 100644 --- a/docker/database/Dockerfile +++ b/docker/database/Dockerfile @@ -2,7 +2,7 @@ FROM postgres:14 LABEL maintainer="outdoors@acm.org" -LABEL version="0.62.4" +LABEL version="0.62.5" ENV POSTGRES_DB "test" ENV POSTGRES_USER "augur" diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile index e388bb708..f0f4bda48 100644 --- a/docker/rabbitmq/Dockerfile +++ b/docker/rabbitmq/Dockerfile @@ -1,7 +1,7 @@ FROM rabbitmq:3.12-management-alpine LABEL maintainer="574/augur@simplelogin.com" -LABEL version="0.62.4" +LABEL version="0.62.5" COPY --chown=rabbitmq:rabbitmq ./docker/rabbitmq/augur.conf /etc/rabbitmq/conf.d/ diff --git a/metadata.py b/metadata.py index 6dac1b232..94f69cb79 100644 --- a/metadata.py +++ b/metadata.py @@ -5,8 +5,8 @@ __short_description__ = "Python 3 package for free/libre and open-source software community metrics, models & data collection" -__version__ = "0.62.4" -__release__ = "v0.62.4 (KC Chiefs)" +__version__ = "0.62.5" +__release__ = "v0.62.5 (KC Chiefs)" __license__ = "MIT" __copyright__ = "University of Missouri, University of Nebraska-Omaha, CHAOSS, Brian Warner & Augurlabs 2024" From 94c5fa163f55687212ced841ecb542ad3ecc54a3 Mon Sep 17 00:00:00 2001 From: "Sean P. Goggins" Date: Tue, 20 Feb 2024 14:30:51 -0600 Subject: [PATCH 3/3] bug fix 2 Signed-off-by: Sean P. Goggins --- augur/api/routes/pull_request_reports.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/augur/api/routes/pull_request_reports.py b/augur/api/routes/pull_request_reports.py index 6d05765b7..b52973ae7 100644 --- a/augur/api/routes/pull_request_reports.py +++ b/augur/api/routes/pull_request_reports.py @@ -97,7 +97,7 @@ def pull_request_data_collection(repo_id, start_date, end_date): JOIN repo on repo.repo_id = pull_requests.repo_id LEFT OUTER JOIN pull_request_message_ref on pull_requests.pull_request_id = pull_request_message_ref.pull_request_id LEFT OUTER JOIN message on pull_request_message_ref.msg_id = message.msg_id - WHERE repo.repo_id = 1 + WHERE repo.repo_id = {repo_id} GROUP BY pull_requests.pull_request_id ) response_times ON pull_requests.pull_request_id = response_times.pull_request_id @@ -106,7 +106,7 @@ def pull_request_data_collection(repo_id, start_date, end_date): FROM pull_request_commits, pull_requests, pull_request_meta WHERE pull_requests.pull_request_id = pull_request_commits.pull_request_id AND pull_requests.pull_request_id = pull_request_meta.pull_request_id - AND pull_requests.repo_id = 1 + AND pull_requests.repo_id = {repo_id} AND pr_cmt_sha <> pull_requests.pr_merge_commit_sha AND pr_cmt_sha <> pull_request_meta.pr_sha GROUP BY pull_request_commits.pull_request_id @@ -116,7 +116,7 @@ def pull_request_data_collection(repo_id, start_date, end_date): SELECT MAX(pr_repo_meta_id), pull_request_meta.pull_request_id, pr_head_or_base, pr_src_meta_label FROM pull_requests, pull_request_meta WHERE pull_requests.pull_request_id = pull_request_meta.pull_request_id - AND pull_requests.repo_id = 1 + AND pull_requests.repo_id = {repo_id} AND pr_head_or_base = 'base' GROUP BY pull_request_meta.pull_request_id, pr_head_or_base, pr_src_meta_label ) base_labels @@ -127,7 +127,7 @@ def pull_request_data_collection(repo_id, start_date, end_date): WHERE cmt_commit_hash = pr_cmt_sha AND pull_requests.pull_request_id = pull_request_commits.pull_request_id AND pull_requests.pull_request_id = pull_request_meta.pull_request_id - AND pull_requests.repo_id = 1 + AND pull_requests.repo_id = {repo_id} AND commits.repo_id = pull_requests.repo_id AND commits.cmt_commit_hash <> pull_requests.pr_merge_commit_sha AND commits.cmt_commit_hash <> pull_request_meta.pr_sha @@ -137,7 +137,7 @@ def pull_request_data_collection(repo_id, start_date, end_date): WHERE repo.repo_group_id = repo_groups.repo_group_id AND repo.repo_id = pull_requests.repo_id - AND repo.repo_id = 1 + AND repo.repo_id = {repo_id} ORDER BY merged_count DESC """)