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.

Sign up for GitHub

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

Jump to bottom

Fixed the Typo in current version #2716

Closed
wants to merge 1 commit into from
Closed

Fixed the Typo in current version #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion augur/application/db/models/augur_data.py
View file
Open in desktop
Expand Up @@ -1911,7 +1911,7 @@ class RepoDepsLibyear(Base):
requirement = Column(String)
type = Column(String)
package_manager = Column(String)
current_verion = Column(String)
current_version = Column(String)
latest_version = Column(String)
current_release_date = Column(String)
latest_release_date = Column(String)
Expand Down
4 changes: 2 additions & 2 deletions augur/application/db/models/augur_data_old.py
View file
Open in desktop
Expand Up @@ -2306,7 +2306,7 @@
# }


# # TODO: typo in field current_verion
# # TODO: typo in field current_version
# class RepoDepsLibyear(Base):
# repo_deps_libyear_id = Column(BigInteger, primary_key=True, nullable=False)
# repo_id = Column(
Expand All @@ -2316,7 +2316,7 @@
# requirement = Column(String())
# type = Column(String())
# package_manager = Column(String())
# current_verion = Column(String())
# current_version = Column(String())
# latest_version = Column(String())
# current_release_date = Column(String())
# latest_release_date = Column(String())
Expand Down
4 changes: 2 additions & 2 deletions augur/application/schema/20211006-augur-0.21.0-release.ndm2
View file
Open in desktop
Expand Up @@ -28872,7 +28872,7 @@
},
{
"objectType": "TableField_PGSQL",
"name": "current_verion",
"name": "current_version",
"type": "varchar",
"length": 0,
"decimals": 0,
Expand All @@ -28882,7 +28882,7 @@
"defaultType": "None",
"defaultValue": "",
"comment": "",
"oldName": "current_verion",
"oldName": "current_version",
"typeOID": 1,
"fieldObjectType": "",
"objectTypeSchema": "",
Expand Down
4 changes: 2 additions & 2 deletions augur/application/schema/alembic/versions/1_augur_new_changes.py
View file
Open in desktop
Expand Up @@ -644,14 +644,14 @@ def add_materialized_views_13(upgrade=True):
a.repo_name,
b.name,
b.requirement,
b.current_verion,
b.current_version,
b.latest_version,
b.current_release_date,
b.libyear,
max(b.data_collection_date) AS max
FROM augur_data.repo a,
augur_data.repo_deps_libyear b
GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear
GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear
ORDER BY a.repo_id, b.requirement; """))

conn.execute(text("""
Expand Down
4 changes: 2 additions & 2 deletions augur/application/schema/alembic/versions/4_explorer_materialized_view_update.py
View file
Open in desktop
Expand Up @@ -127,14 +127,14 @@ def add_materialized_views_15(upgrade=True):
a.repo_name,
b.name,
b.requirement,
b.current_verion,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way to change column names is to add a new alembic script in this same directory, and ensure that it does the column renaming correctly. Unfortunately this involves creating a temporary table, loading existing data, recreating the repo_deps_libyear table and loading the data back from the temp table.

b.current_version,
b.latest_version,
b.current_release_date,
b.libyear,
max(b.data_collection_date) AS max
FROM augur_data.repo a,
augur_data.repo_deps_libyear b
GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear
GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear
ORDER BY a.repo_id, b.requirement; """))

conn.execute(text("""
Expand Down
2 changes: 1 addition & 1 deletion augur/application/schema/alembic/versions/legacy/80.2-create-tables.sql
View file
Open in desktop
Expand Up @@ -2906,7 +2906,7 @@ CREATE TABLE "augur_data"."repo_deps_libyear" (
"requirement" varchar COLLATE "pg_catalog"."default",
"type" varchar COLLATE "pg_catalog"."default",
"package_manager" varchar COLLATE "pg_catalog"."default",
"current_verion" varchar COLLATE "pg_catalog"."default",
"current_version" varchar COLLATE "pg_catalog"."default",
"latest_version" varchar COLLATE "pg_catalog"."default",
"current_release_date" varchar COLLATE "pg_catalog"."default",
"latest_release_date" varchar COLLATE "pg_catalog"."default",
Expand Down
4 changes: 2 additions & 2 deletions augur/application/schema/augur_full.sql
View file
Open in desktop
Expand Up @@ -2129,7 +2129,7 @@ CREATE TABLE augur_data.repo_deps_libyear (
requirement character varying,
type character varying,
package_manager character varying,
current_verion character varying,
current_version character varying,
latest_version character varying,
current_release_date character varying,
latest_release_date character varying,
Expand Down Expand Up @@ -4725,7 +4725,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_
-- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur
--

COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin;
COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin;
\.


Expand Down
6 changes: 3 additions & 3 deletions augur/tasks/git/dependency_libyear_tasks/core.py
View file
Open in desktop
@@ -1,11 +1,11 @@
from datetime import datetime

Check warning on line 1 in augur/tasks/git/dependency_libyear_tasks/core.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
C0114: Missing module docstring (missing-module-docstring)

Raw Output:
augur/tasks/git/dependency_libyear_tasks/core.py:1:0: C0114: Missing module docstring (missing-module-docstring)
import logging
import requests
import re
import os, subprocess

Check warning on line 5 in augur/tasks/git/dependency_libyear_tasks/core.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
C0410: Multiple imports on one line (os, subprocess) (multiple-imports)

Raw Output:
augur/tasks/git/dependency_libyear_tasks/core.py:5:0: C0410: Multiple imports on one line (os, subprocess) (multiple-imports)
import traceback
import sqlalchemy as s
from augur.application.db.models import *

Check warning on line 8 in augur/tasks/git/dependency_libyear_tasks/core.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
W0401: Wildcard import augur.application.db.models (wildcard-import)

Raw Output:
augur/tasks/git/dependency_libyear_tasks/core.py:8:0: W0401: Wildcard import augur.application.db.models (wildcard-import)
from augur.application.db.session import DatabaseSession
from augur.application.config import AugurConfig
from augur.application.db.util import execute_session_query
Expand All @@ -13,7 +13,7 @@
from augur.tasks.git.dependency_libyear_tasks.libyear_util.util import get_deps_libyear_data
from augur.tasks.git.util.facade_worker.facade_worker.utilitymethods import get_absolute_repo_path

def deps_libyear_model( session, repo_id,repo_git,repo_group_id):

Check warning on line 16 in augur/tasks/git/dependency_libyear_tasks/core.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
W0613: Unused argument 'repo_group_id' (unused-argument)

Raw Output:
augur/tasks/git/dependency_libyear_tasks/core.py:16:50: W0613: Unused argument 'repo_group_id' (unused-argument)
""" Data collection and storage method
"""
session.logger.info(f"This is the libyear deps model repo: {repo_git}")
Expand Down Expand Up @@ -58,7 +58,7 @@
'requirement' : dep['requirement'],
'type' : dep['type'],
'package_manager' : dep['package'],
'current_verion' : dep['current_version'],
'current_version' : dep['current_version'],
'latest_version' : dep['latest_version'],
'current_release_date' : dep['current_release_date'],
'latest_release_date' : dep['latest_release_date'],
Expand All @@ -72,8 +72,8 @@
#result = self.db.execute(self.repo_deps_libyear_table.insert().values(repo_deps))
#self.logger.info(f"Added dep: {result.inserted_primary_key}")
#insert_statement = s.sql.text("""
# INSERT INTO "repo_deps_libyear" ("repo_id","name","requirement","type","package_manager","current_verion","latest_version","current_release_date","latest_release_date","libyear","tool_source","tool_version","data_source","data_collection_date")
# VALUES (:repo_id, :name,:requirement,:type,:package_manager,:current_verion,:latest_version,:current_release_date,:latest_release_date,:libyear,:tool_source,:tool_version,:data_source, :data_collection_date)
# INSERT INTO "repo_deps_libyear" ("repo_id","name","requirement","type","package_manager","current_version","latest_version","current_release_date","latest_release_date","libyear","tool_source","tool_version","data_source","data_collection_date")
# VALUES (:repo_id, :name,:requirement,:type,:package_manager,:current_version,:latest_version,:current_release_date,:latest_release_date,:libyear,:tool_source,:tool_version,:data_source, :data_collection_date)
#""").bindparams(**repo_deps)
#
#session.execute_sql(insert_statement)
Expand Down
4 changes: 2 additions & 2 deletions docker/database/augur-new-schema.sql
View file
Open in desktop
Expand Up @@ -2985,7 +2985,7 @@ CREATE TABLE augur_data.repo_deps_libyear (
requirement character varying,
type character varying,
package_manager character varying,
current_verion character varying,
current_version character varying,
latest_version character varying,
current_release_date character varying,
latest_release_date character varying,
Expand Down Expand Up @@ -5849,7 +5849,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_
-- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur
--

COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin;
COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin;
\.


Expand Down
8 changes: 4 additions & 4 deletions tests/entire_db.sql
View file
Open in desktop
Expand Up @@ -1941,7 +1941,7 @@ CREATE TABLE augur_data.repo_deps_libyear (
requirement character varying,
type character varying,
package_manager character varying,
current_verion character varying,
current_version character varying,
latest_version character varying,
current_release_date character varying,
latest_release_date character varying,
Expand Down Expand Up @@ -1983,14 +1983,14 @@ CREATE MATERIALIZED VIEW augur_data.explorer_libyear_detail AS
a.repo_name,
b.name,
b.requirement,
b.current_verion,
b.current_version,
b.latest_version,
b.current_release_date,
b.libyear,
max(b.data_collection_date) AS max
FROM augur_data.repo a,
augur_data.repo_deps_libyear b
GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear
GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear
ORDER BY a.repo_id, b.requirement
WITH NO DATA;

Expand Down Expand Up @@ -6714,7 +6714,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_
-- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur
--

COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin;
COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin;
\.


Expand Down