Merge pull request #2946 from chaoss/main

Merge Patches back to Dev

README.md

@@ -1,4 +1,4 @@
-# Augur NEW Release v0.76.4
+# Augur NEW Release v0.76.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 [here](https://metrix.chaoss.io) - this is tied to a public instance of [Augur](https://ai.chaoss.io). 
@@ -12,7 +12,7 @@ We follow the [First Timers Only](https://www.firsttimersonly.com/) philosophy o
 **If you want to jump right in, the updated docker, docker-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.76.2).
+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.76.5).
 
 
 - The `main` branch is a stable version of our new architecture, which features:

augur/application/db/models/augur_data.py

@@ -938,9 +938,12 @@ def is_valid_github_repo(gh_session, url: str) -> bool:
                     mktime(gmtime(time()))
                 )
                 wait_until_time = localtime(wait_until)
-                logger.error(f"rate limited fetching {url}z")
+                logger.error(f"rate limited fetching {url}")
                 logger.error(f"sleeping until {wait_until_time.tm_hour}:{wait_until_time.tm_min} ({wait_in_seconds} seconds)")
                 sleep(wait_in_seconds)
+                attempts+=1
+                continue
+
             # if there was an error return False
             if "message" in data.keys():
 

docker/backend/Dockerfile

@@ -2,7 +2,7 @@
 FROM python:3.11-slim-bullseye
 
 LABEL maintainer="[email protected]"
-LABEL version="0.76.1"
+LABEL version="0.76.5"
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV PATH="/usr/bin/:/usr/local/bin:/usr/lib:${PATH}"
@@ -28,6 +28,7 @@ RUN set -x \
         cargo \
         chromium \
         tar \
+	jq \
         chromium-driver \
         && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
@@ -39,7 +40,7 @@ RUN set -x \
     && apt-get install -y firefox-esr
 
 # Install Geckodriver
-RUN GECKODRIVER_VERSION=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | grep 'tag_name' | cut -d\" -f4 | sed 's/v//') \
+RUN GECKODRIVER_VERSION=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | jq -r '.tag_name' | sed 's/v//') \
     && ARCH=$(uname -m) \
     && if [ "$ARCH" = "aarch64" ]; then \
          GECKODRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/v${GECKODRIVER_VERSION}/geckodriver-v${GECKODRIVER_VERSION}-linux-aarch64.tar.gz"; \
@@ -111,4 +112,4 @@ COPY ./docker/backend/init.sh /
 RUN chmod +x /entrypoint.sh /init.sh
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
 #ENTRYPOINT ["/entrypoint.sh"]
-CMD /init.sh
+CMD /init.sh

docker/database/Dockerfile

@@ -2,7 +2,7 @@
 FROM postgres:16
 
 LABEL maintainer="[email protected]"
-LABEL version="0.76.1"
+LABEL version="0.76.5"
 
 ENV POSTGRES_DB "test"
 ENV POSTGRES_USER "augur"

docker/rabbitmq/Dockerfile

@@ -1,7 +1,7 @@
 FROM rabbitmq:3.12-management-alpine
 
 LABEL maintainer="574/[email protected]"
-LABEL version="0.76.1"
+LABEL version="0.76.5"
 
 ARG RABBIT_MQ_DEFAULT_USER=augur
 ARG RABBIT_MQ_DEFAULT_PASSWORD=password123

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.76.4"
-__release__ = "v0.76.4 (Pumpkin Core)"
+__version__ = "0.76.5"
+__release__ = "v0.76.5 (Pumpkin Home Companion)"
 
 __license__ = "MIT"
 __copyright__ = "University of Missouri, University of Nebraska-Omaha, CHAOSS, Brian Warner & Augurlabs 2112"