Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add main fixes #2779

Merged
merged 3 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Augur NEW Release v0.63.0
# Augur NEW Release v0.63.3

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
Expand All @@ -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.63.0
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.63.3

- 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.
Expand Down
8 changes: 7 additions & 1 deletion augur/application/db/models/augur_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,13 @@ class Repo(Base):
@staticmethod
def get_by_id(session, repo_id):

return session.query(Repo).filter(Repo.repo_id == repo_id).first()
try:
return session.query(Repo).filter(Repo.repo_id == repo_id).first()
except Exception as e:
session.rollback()
raise e



@staticmethod
def get_by_repo_git(session, repo_git):
Expand Down
11 changes: 10 additions & 1 deletion augur/application/db/models/augur_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@ def get_user(session, username: str):
return user
except NoResultFound:
return None
except Exception as e:
session.rollback()
raise e

@staticmethod
def get_by_id(session, user_id: int):
Expand Down Expand Up @@ -1073,7 +1076,13 @@ def __eq__(self, other):

@staticmethod
def get_by_id(session, client_id):
return session.query(ClientApplication).filter(ClientApplication.id == client_id).first()

try:
return session.query(ClientApplication).filter(ClientApplication.id == client_id).first()
except Exception as e:
session.rollback()
raise e


class Subscription(Base):
__tablename__ = "subscriptions"
Expand Down
2 changes: 1 addition & 1 deletion docker/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM python:3.10-bookworm

LABEL maintainer="[email protected]"
LABEL version="0.63.0"
LABEL version="0.63.3"

ENV DEBIAN_FRONTEND=noninteractive

Expand Down
2 changes: 1 addition & 1 deletion docker/database/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM postgres:14

LABEL maintainer="[email protected]"
LABEL version="0.63.0"
LABEL version="0.63.3"

ENV POSTGRES_DB "test"
ENV POSTGRES_USER "augur"
Expand Down
2 changes: 1 addition & 1 deletion docker/rabbitmq/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM rabbitmq:3.12-management-alpine

LABEL maintainer="574/[email protected]"
LABEL version="0.63.0"
LABEL version="0.63.3"

ARG RABBIT_MQ_DEFAULT_USER
ARG RABBIT_MQ_DEFAULT_PASSWORD
Expand Down
4 changes: 2 additions & 2 deletions metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

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

__version__ = "0.63.0"
__release__ = "v0.63.0 (Ides of March)"
__version__ = "0.63.3"
__release__ = "v0.63.3 (Supply Chain Gang)"

__license__ = "MIT"
__copyright__ = "University of Missouri, University of Nebraska-Omaha, CHAOSS, Brian Warner & Augurlabs 2024"
Loading