DEV 2014 use nexus and remove travis (#64)

* use nexus and remove travis

* update gitlab ci

.gitlab-ci.yml

@@ -2,29 +2,24 @@
 
 include:
   - project: nci-gdc/gitlab-templates
-    ref: 0.2.0
+    ref: 0.2.1
     file:
       - templates/global/full.yaml
       - templates/python/full.yaml
       - templates/common/python.yaml
 
 tox:
-  stage: test
   parallel:
     matrix:
-      - PYTHON_VERSION: [ '3.6', '3.7', '3.8', '3.9' ]
-  image: ${BASE_CONTAINER_REGISTRY}/python${PYTHON_VERSION}-builder
+      - BUILD_PY_VERSION: [ 'python3.6', 'python3.7', 'python3.8', 'python3.9' ]
   services:
     - name: docker.osdc.io/ncigdc/ci-postgres-13:${BASE_CONTAINER_VERSION}
       alias: postgres
-  tags:
-    - dind
   variables:
-    BASE_CONTAINER_VERSION: 2.3.1
     # these are for postgres docker
     POSTGRES_DB: automated_test
-    POSTGRES_USER: postgres
-    POSTGRES_PASSWORD: postgres
+    POSTGRES_USER: gdc_test
+    POSTGRES_PASSWORD: gdc_test
     POSTGRES_HOST_AUTH_METHOD: trust
     PG_HOST: postgres
   before_script:
@@ -34,15 +29,9 @@ tox:
     - tox -r -e py
 
 
-# used by release
-.python_versions:
+release:
   parallel:
     matrix:
-      - BUILD_PY_VERSION: [python3.6]
-      - RELEASE_PY_VERSION: [python3.6]
-
-release:
+      - RELEASE_PY_VERSION: [ python3.6 ]
   before_script:
     - git fetch --unshallow || true
-  variables:
-    LEGACY_BASE_CONTAINER_VERSION: 2.3.0

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
+  - repo: https://github.com/psf/black
+    rev: 22.3.0
+    hooks:
+      - id: black
   - repo: git@github.com:Yelp/detect-secrets
     rev: v1.4.0
     hooks:
       - id: detect-secrets
         args: ['--baseline', '.secrets.baseline']
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-      - id: black

.secrets.baseline

@@ -122,9 +122,9 @@
       {
         "type": "Secret Keyword",
         "filename": ".gitlab-ci.yml",
-        "hashed_secret": "afc848c316af1a89d49826c5ae9d00ed769415f3",
+        "hashed_secret": "58106e026393e6fedebefcdb423192d32cd7210a",
         "is_verified": false,
-        "line_number": 27,
+        "line_number": 22,
         "is_secret": false
       }
     ],
@@ -157,17 +157,7 @@
         "line_number": 13,
         "is_secret": false
       }
-    ],
-    "psql-users.sh": [
-      {
-        "type": "Secret Keyword",
-        "filename": "psql-users.sh",
-        "hashed_secret": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
-        "is_verified": false,
-        "line_number": 1,
-        "is_secret": true
-      }
     ]
   },
-  "generated_at": "2023-07-19T23:58:43Z"
+  "generated_at": "2023-08-25T14:30:18Z"
 }

gdc_ng_models/snacks/database.py

@@ -15,8 +15,8 @@ def get_configs():
     return {
         "host": os.environ.get("PG_HOST", "localhost"),
         "database": os.environ.get("PG_NAME", "automated_test"),
-        "admin_user": os.environ.get("PG_USER", "postgres"),
-        "admin_password": os.environ.get("PG_PASS", "postgres"),
+        "admin_user": os.environ.get("PG_USER", "gdc_test"),
+        "admin_password": os.environ.get("PG_PASS", "gdc_test"),
     }
 
 

setup.py

@@ -16,7 +16,7 @@
             "flake8",
             "pytest",
             "pytest-cov",
-            "cdisutils @ git+https://git@github.com/NCI-GDC/cdisutils.git@1.3.0#egg=cdisutils",
+            "cdisutils",
         ],
         "alembic": ["alembic~=1.4"],
     },

tox.ini

@@ -8,7 +8,7 @@ setenv =
     NO_PROXY=localhost,postgres
     no_proxy=localhost,postgres
 deps=
-    -rdev-requirements.txt
+    .[dev]
 commands=
     pytest -vvs --cov gdc_ng_models --cov-report xml --cov-report html --junit-xml test-reports/results.xml {posargs}