diff options
| -rw-r--r-- | Jenkinsfile | 3 | ||||
| -rw-r--r-- | requirements.txt | 112 | ||||
| -rw-r--r-- | test_utils/conftest.py | 4 | ||||
| -rw-r--r-- | tests/models/gr/test_base.py | 1 |
4 files changed, 1 insertions, 119 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 942519e..c44e57b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,6 @@ pipeline { } stages { - stage('Setup') { steps { dir("generalresearch-${PYTHON_VERSION}") { @@ -54,7 +53,7 @@ pipeline { } sh "/usr/local/bin/${PYTHON_VERSION} -m venv ${VENV}-${PYTHON_VERSION}" sh "${VENV}-${PYTHON_VERSION}/bin/pip install -U setuptools wheel pip" - sh "${VENV}-${PYTHON_VERSION}/bin/pip install -r requirements.txt" + sh "${VENV}-${PYTHON_VERSION}/bin/pip install '.'" sh "${VENV}-${PYTHON_VERSION}/bin/pip install '.[django]'" } } diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 6c04995..0000000 --- a/requirements.txt +++ /dev/null @@ -1,112 +0,0 @@ -aiohappyeyeballs==2.6.1 -aiohttp==3.12.15 -aiosignal==1.4.0 -annotated-types==0.7.0 -anyio==4.10.0 -attrs==25.3.0 -boto3==1.40.19 -botocore==1.40.19 -CacheControl==0.14.3 -cachetools==6.1.0 -certifi==2025.8.3 -cffi==1.17.1 -charset-normalizer==3.4.3 -click==8.2.2 -cloudpickle==3.1.1 -coverage==7.10.5 -cryptography==45.0.6 -dask==2025.7.0 -decorator==5.2.1 -Deprecated==1.2.18 -distributed==2025.7.0 -dnspython==2.7.0 -Django>=5.2 -ecdsa==0.19.1 -email-validator==2.3.0 -Faker==37.6.0 -filelock==3.25.1 -frozenlist==1.7.0 -fsspec==2025.7.0 -geoip2==4.7.0 -idna==3.10 -importlib_metadata==8.7.0 -iniconfig==2.1.0 -Jinja2==3.1.6 -jmespath==1.0.1 -jsonpickle==5.0.0rc1 -limits==5.5.0 -locket==1.0.0 -MarkupSafe==3.0.2 -maxminddb==2.8.2 -more-itertools==10.7.0 -msgpack==1.1.1 -multidict==6.6.4 -mypy_extensions==1.1.0 -numpy==2.3.2 -opentelemetry-api==1.36.0 -opentelemetry-sdk==1.36.0 -opentelemetry-semantic-conventions==0.57b0 -outcome==1.3.0.post0 -packaging==25.0 -pandas==2.3.2 -pandera==0.26.1 -partd==1.4.2 -phonenumbers==9.0.12 -pluggy==1.6.0 -propcache==0.3.2 -protobuf==6.32.0 -psutil==7.0.0 -psycopg==3.2.9 -psycopg-binary==3.2.9 -pyarrow==21.0.0 -pyasn1==0.6.1 -pycountry==24.6.1 -pycparser==2.22 -pydantic==2.11.7 -pydantic-extra-types==2.10.5 -pydantic-settings==2.10.1 -pydantic_core==2.33.2 -Pygments==2.19.2 -pylibmc==1.6.3 -pymemcache==4.0.0 -PyMySQL==1.1.1 -pytest==8.4.1 -pytest-anyio==0.0.0 -pytest-cov==6.2.1 -python-dateutil==2.9.0.post0 -python-dotenv==1.1.1 -python-jose==3.5.0 -pytz==2025.2 -PyYAML==6.0.2 -redis==6.4.0 -requests==2.32.5 -requests-file==3.0.1 -rsa==4.9.1 -s3transfer==0.13.1 -scipy==1.16.1 -sentry-sdk==3.0.0a5 -setuptools==80.9.0 -six==1.17.0 -slackclient==2.9.4 -sniffio==1.3.1 -sortedcontainers==2.4.0 -tblib==3.1.0 -tldextract==5.3.1 -toolz==1.0.0 -tornado==6.5.2 -trio==0.30.0 -typeguard==4.4.4 -typing-inspect==0.9.0 -typing-inspection==0.4.1 -typing_extensions==4.15.0 -tzdata==2025.2 -ua-parse==1.0.1 -ua-parser==1.0.1 -ua-parser-builtins==0.19.0.dev79 -urllib3==2.5.0 -user-agents==2.2.0 -wheel==0.46.1 -wrapt==1.17.3 -yarl==1.20.1 -zict==3.0.0 -zipp==3.23.0 diff --git a/test_utils/conftest.py b/test_utils/conftest.py index 9b631ff..041caf2 100644 --- a/test_utils/conftest.py +++ b/test_utils/conftest.py @@ -172,7 +172,6 @@ def git_key_path( # We are using the tmp_path_factory because unlike the tmp_path (which # is function scoped), this is session scoped. - print("GIT CREDS", settings.git_creds) assert settings.git_creds, "Must define key to download alternative models" fn = tmp_path_factory.mktemp("keys") / "git_creds" key_content = settings.git_creds.replace("\\n", "\n") @@ -210,7 +209,6 @@ def gr_repo( "-o StrictHostKeyChecking=no " ) env = {**os.environ, "GIT_SSH_COMMAND": ssh_cmd} - print("SSH ENV", env) if repo_path.exists(): subprocess.run(["git", "-C", str(repo_path), "pull"], check=True, env=env) @@ -256,8 +254,6 @@ def django_db_factory( # 1. Bootstrapping Django settings if not django_settings.configured: - print(postgres_instance_dict) - django_settings.configure( DATABASES={ "default": { diff --git a/tests/models/gr/test_base.py b/tests/models/gr/test_base.py index a066fa1..f019fc0 100644 --- a/tests/models/gr/test_base.py +++ b/tests/models/gr/test_base.py @@ -44,6 +44,5 @@ class TestGRPostgresDjangoCreation: FROM information_schema.tables WHERE table_schema = 'public'; """) - print(res) assert len(res) == 1 assert res[0]["count"] == 10 |