Skip to content

Commit ae0daa8

Browse files
authored
Merge pull request #3293 from chaoss/main
Release v0.90.3
2 parents af75424 + b0bb3b8 commit ae0daa8

12 files changed

Lines changed: 377 additions & 302 deletions

File tree

.github/workflows/build_docker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ jobs:
300300
- database
301301
- keyman
302302
- rabbitmq
303+
- empty_database
303304
runs-on: ubuntu-latest
304305
steps:
305306
- name: Checkout repository

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Augur NEW Release v0.90.0
1+
# Augur NEW Release v0.90.3
22

33
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!
44
The primary way of looking at Augur data is through [8Knot](https://github.com/oss-aspen/8knot), a public instance of 8Knot is available [here](https://metrix.chaoss.io) - this is tied to a public instance of [Augur](https://ai.chaoss.io).
@@ -11,7 +11,7 @@ We follow the [First Timers Only](https://www.firsttimersonly.com/) philosophy o
1111
## NEW RELEASE ALERT!
1212
**If you want to jump right in, the updated docker, docker-compose and bare metal installation instructions are available [here](docs/new-install.md)**.
1313

14-
Augur is now releasing a dramatically improved new version. It is also available [here](https://github.com/chaoss/augur/releases/tag/v0.90.0).
14+
Augur is now releasing a dramatically improved new version. It is also available [here](https://github.com/chaoss/augur/releases/tag/v0.90.3).
1515

1616

1717
- The `release` branch is a stable version of our new architecture, which features:

augur/api/routes/contributor_reports.py

Lines changed: 278 additions & 266 deletions
Large diffs are not rendered by default.

augur/application/cli/github.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def update_api_key():
5656
core_reset_header = "Core Reset Time"
5757
graphql_request_header = "Graphql Requests Left"
5858
graphql_reset_header = "Graphql Reset Time"
59-
print(f"{'Key'.center(40)} {core_request_header} {core_reset_header} {graphql_request_header} {graphql_reset_header}")
59+
print(f"{'Key'.center(40)} {core_request_header} {core_reset_header.center(24)} {graphql_request_header} {graphql_reset_header.center(24)}")
6060
for key, core_key_data, graphql_key_data in valid_key_data:
6161
core_requests = str(core_key_data['requests_remaining']).center(len(core_request_header))
6262
core_reset_time = str(epoch_to_local_time_with_am_pm(core_key_data["reset_epoch"])).center(len(core_reset_header))
@@ -87,13 +87,12 @@ def update_api_key():
8787

8888
engine.dispose()
8989

90-
9190
def epoch_to_local_time_with_am_pm(epoch):
92-
local_time = datetime.fromtimestamp(epoch)
93-
formatted_time = local_time.strftime('%I:%M %p') # This format includes the date as well
91+
# Convert epoch to local time with timezone awareness
92+
local_time = datetime.fromtimestamp(epoch).astimezone()
93+
formatted_time = local_time.strftime('%I:%M %p %Z (UTC%z)').center(24)
9494
return formatted_time
9595

96-
9796
def find_duplicates(lst):
9897
counter = Counter(lst)
9998
return [item for item, count in counter.items() if count > 1]

augur/tasks/git/facade_tasks.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ def facade_phase(repo_git, full_collection):
491491
#force_analysis = session.force_analysis
492492
run_facade_contributors = facade_helper.run_facade_contributors
493493

494-
facade_sequence = []
495494
facade_core_collection = []
496495

497496
if not limited_run or (limited_run and pull_repos):
@@ -509,14 +508,12 @@ def facade_phase(repo_git, full_collection):
509508

510509

511510
#These tasks need repos to be cloned by facade before they can work.
512-
facade_sequence.append(
513-
group(
514-
chain(*facade_core_collection),
515-
process_dependency_metrics.si(repo_git),
516-
process_libyear_dependency_metrics.si(repo_git),
517-
process_scc_value_metrics.si(repo_git)
518-
)
511+
facade_sequence = group(
512+
chain(*facade_core_collection),
513+
process_dependency_metrics.si(repo_git),
514+
process_libyear_dependency_metrics.si(repo_git),
515+
process_scc_value_metrics.si(repo_git)
519516
)
520517

521518
logger.info(f"Facade sequence: {facade_sequence}")
522-
return chain(*facade_sequence)
519+
return facade_sequence

docker/backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN go install github.com/ossf/scorecard/v5@v5.1.1 \
2020
FROM python:3.11-slim-bullseye
2121

2222
LABEL maintainer="outdoors@acm.org"
23-
LABEL version="0.90.0"
23+
LABEL version="0.90.3"
2424

2525
ENV DEBIAN_FRONTEND=noninteractive
2626
ENV PATH="/usr/bin/:/usr/local/bin:/usr/lib:${PATH}"

docker/database/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM postgres:16
33

44
LABEL maintainer="outdoors@acm.org"
5-
LABEL version="0.90.0"
5+
LABEL version="0.90.3"
66

77
ENV POSTGRES_DB="test"
88
ENV POSTGRES_USER="augur"

docker/empty_database/Dockerfile

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
from postgres:16 AS builder
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
5+
# Install uv (https://docs.astral.sh/uv/guides/integration/docker/#installing-uv)
6+
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
7+
ENV UV_COMPILE_BYTECODE=1
8+
# The uv package cache will be on a cache volume, so can't be linked
9+
ENV UV_LINK_MODE=copy
10+
# Assert that the lockfile (uv.lock) is up-to-date. Use `uv lock` to update it
11+
# manually if this fails the container build.
12+
ENV UV_LOCKED=1
13+
14+
WORKDIR /augur
15+
16+
COPY pyproject.toml .
17+
COPY uv.lock .
18+
COPY .python-version .
19+
20+
# Install augur's dependencies early to take advantage of build cache
21+
RUN --mount=type=cache,target=/root/.cache/uv \
22+
uv sync --no-install-project --no-dev
23+
24+
# Copy in the actual code
25+
# The RUN line below ensure that permissions are set correctly.
26+
# This is the equivalent of the following docker --chmod flags, but done in a way thats compatible with podman.
27+
# This can be removed once https://github.com/containers/buildah/issues/6066 or relevant equivalent is fixed
28+
# - u=rw,u+X: user can read and write all files/dirs and execute directories
29+
# - go=r,go+X: group and others can read all files/dirs and execute directories
30+
COPY README.md .
31+
COPY LICENSE .
32+
COPY alembic.ini .
33+
COPY augur/ augur/
34+
COPY metadata.py .
35+
COPY scripts/ scripts/
36+
37+
RUN find augur -type d -exec chmod u=rwx,go=rx {} + && find augur -type f -exec chmod u=rw,go=r {} +
38+
39+
RUN find scripts -exec chmod u=rwx,go=rx {} +
40+
41+
# Install the main project
42+
RUN --mount=type=cache,target=/root/.cache/uv \
43+
uv sync --no-dev
44+
45+
# We aren't going to activate the virtualenv (manually or via uv run), so we
46+
# need adjust the PATH
47+
ENV PATH="/augur/.venv/bin:${PATH}"
48+
49+
ENV POSTGRES_DB="augur"
50+
ENV POSTGRES_USER="augur"
51+
ENV POSTGRES_PASSWORD="augur"
52+
ENV AUGUR_DB="postgresql+psycopg2://augur:augur@localhost:5432/augur"
53+
# ENV PGDATA="/var/lib/postgresql/data"
54+
55+
RUN set -e && \
56+
gosu postgres initdb && \
57+
gosu postgres pg_ctl -D "$PGDATA" -o "-c listen_addresses='localhost'" -w start && \
58+
gosu postgres psql -c "CREATE USER ${POSTGRES_USER} WITH SUPERUSER PASSWORD '${POSTGRES_PASSWORD}';" && \
59+
gosu postgres psql -c "CREATE DATABASE ${POSTGRES_DB} OWNER ${POSTGRES_USER};" && \
60+
augur db create-schema && \
61+
gosu postgres pg_ctl -D "$PGDATA" -m fast -w stop
62+
63+
64+
FROM postgres:16
65+
66+
COPY --from=builder /var/lib/postgresql/data /var/lib/postgresql/data

docker/keyman/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM python:3.11.12-alpine
22

33
LABEL maintainer="outdoors@acm.org"
4-
LABEL version="0.90.0"
4+
LABEL version="0.90.3"
55

66
RUN pip install --no-cache-dir --upgrade pip
77

metadata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
__short_description__ = "Python 3 package for free/libre and open-source software community metrics, models & data collection"
77

8-
__version__ = "0.90.0"
9-
__release__ = "v0.90.0 (Trade Deadline)"
8+
__version__ = "0.90.3"
9+
__release__ = "v0.90.3 (Trade Deadline)"
1010

1111
__license__ = "MIT"
1212
__copyright__ = "University of Missouri, University of Nebraska-Omaha, CHAOSS, Sean Goggins, Brian Warner & Augurlabs 2025, Red Hat Software"

0 commit comments

Comments
 (0)