Removed runtime.txt and fixed poetry.lock

mitodl · Sep 21, 2023 · 19be438 · 19be438
1 parent 6bdac3d
commit 19be438
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 63 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,30 +48,26 @@ jobs:
         run: cat Aptfile | sudo xargs apt-get install
 
       - name: Install poetry
-          uses: snok/install-poetry@v1
-          with:
-            version: 1.5.1
-            virtualenvs-create: true
-            virtualenvs-in-project: true
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.5.1
+          virtualenvs-create: true
+          virtualenvs-in-project: true
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.9.1"
+          python-version: "3.9.17"
+          cache: "poetry"
 
-      - id: cache
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt', '**/test_reqirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+      - name: Poetry lock check
+        run: poetry lock --check
 
       - name: Install dependencies
         run: poetry install --no-interaction
 
       - name: Lint
-        run: pylint ./**/*.py
+        run: poetry run pylint ./**/*.py
 
       # You must also add the Configure sysctl limits step, otherwise Opensearch will not be able to boot.
       - name: Configure sysctl limits
@@ -91,7 +87,7 @@ jobs:
           export MEDIA_ROOT="$(mktemp -d)"
           sudo mkdir /var/media 
           sudo chown -R $USER:$USER /var/media
-          tox
+          poetry run tox
         env:
           DEBUG: 'False'
           NODE_ENV: 'production'

diff --git a/poetry.lock b/poetry.lock
diff --git a/pylintrc b/pylintrc
@@ -1,6 +1,7 @@
 [MASTER]
 ignore=migrations,.git
 load-plugins = pylint_django
+django-settings-module = micromasters.settings
 
 [BASIC]
 # Allow django's urlpatterns, and our log preference

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ django-hijack = "2.1.10"
 django-hijack-admin = "2.1.10"
 django-ipware = "3.0.0"
 django-redis = "5.2.0"
-django-robots = "4.0.0"
+django-robots = "~4.0.0"
 django-role-permissions = "2.2.0"
 django-server-status = "0.7.3"
 django-storages = "1.9.1"
@@ -32,8 +32,6 @@ edx-api-client = "1.2.0"
 edx-opaque-keys = "0.4"
 opensearch-py = "1.0.0"
 opensearch-dsl = "1.0.0"
-
-faker = "0.9.1"
 html5lib = "0.999999999"
 l18n = "2021.3"
 ipython = "8.10.0"
@@ -42,19 +40,19 @@ jsonpatch = "1.16"
 newrelic = "6.0.1.155"
 open-discussions-client = "0.5.0"
 phonenumbers = "8.10.23"
-psycopg2 = "^2.9.5"
+psycopg2 = "2.8.6"
 pycountry = "16.11.27.1"
 python-dateutil = "2.5.3"
 sentry-sdk = "1.1.0"
 redis = "3.5.3"
-requests = "2.25.1"
+requests = "^2.25.1"
 setuptools = "67.6.1"
-six = "1.14.0"
+six = "^1.14.0"
 social-auth-app-django = "3.1.0"
 robohash = "1.0"
 static3 = "0.5.1"
-urllib3 = "1.26.5"
-uwsgi = "2.0.18"
+urllib3 = "^1.26.5"
+uwsgi = "^2.0.18"
 wagtail = "2.12.5"
 flaky = "3.7.0"
 pyOpenSSL = "^23.1.1"
@@ -66,19 +64,43 @@ astroid= "2.4.2"
 bpython = "^0.24"
 ddt = "^1.6.0"
 django-debug-toolbar = "^3.2.4"
+factory-boy = "^2.8.1"
+faker = "0.9.1"
 ipdb = "^0.13.13"
 nplusone = "^0.8.1"
 pdbpp = "^0.10.3"
 pip-tools = "^7.1.0"
-pylint = "^2.6.0"
-pylint-django = "^2.4.4"
-pylint-plugin-utils= "^0.6"
+pylint = "2.6.0"
+pylint-django = "2.1.0"
+pylint-plugin-utils = "0.6"
 pytest = "5.3.5"
 pytest-cov = "^4.1.0"
 pytest-django = "^3.8.0"
 pytest-mock = "^3.11.1"
 semantic-version = "^2.10.0"
-selenium= "3.141.0"
+selenium = "3.141.0"
 testfixtures = "7.1.0"
 tox = "3.28.0"
-isort= "4.3.21"
+isort = "4.3.21"
+
+[tool.pytest.ini_options]
+addopts = '''
+--cov .
+--cov-report term
+--cov-report html
+--cov-report xml
+--ds=micromasters.settings
+--reuse-db'''
+norecursedirs = [
+    "node_modules",
+    ".git",
+    ".tox",
+    "static",
+    "templates",
+    ".*",
+    "CVS",
+    "_darcs",
+    "{arch}",
+    "*.egg",
+    "selenium_tests",
+]
diff --git a/pytest.ini b/pytest.ini
diff --git a/pytest_minimal.ini b/pytest_minimal.ini
diff --git a/runtime.txt b/runtime.txt
diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
 envlist = py39
 skipsdist = True
+isolated_build = true
 
 [testenv]
-sitepackages = True
-deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test_requirements.txt
+allowlist_externals = poetry
+commands_pre =
+    poetry install
 commands =
     py.test {posargs}
     {toxinidir}/scripts/test/detect_missing_migrations.sh