Merge branch 'master' into optimize-mongo-method-name

hhyo · Jan 12, 2023 · 5cd5738 · 5cd5738
2 parents 74865a0 + 7088fb9
commit 5cd5738
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -7,4 +7,3 @@ omit =
     src*
     downloads*
     sql/migrations/*
-
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.8, 3.9, 3.10.0]
+        python-version: [3.8, 3.9, "3.10"]
 
     # https://github.com/actions/example-services/tree/master/.github/workflows
     services:
@@ -70,7 +70,7 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        sudo apt-get update && sudo apt-get install libsasl2-dev python-dev libldap2-dev libssl-dev unixodbc unixodbc-dev
+        sudo apt-get update && sudo apt-get install libsasl2-dev libldap2-dev libssl-dev unixodbc unixodbc-dev
         python -m pip install --upgrade pip
         pip install codecov coverage flake8 -r requirements.txt
         
@@ -84,7 +84,7 @@ jobs:
       run: |
         python manage.py makemigrations
         python manage.py makemigrations sql
-        coverage run manage.py test -v 3 --keepdb
+        coverage run --source='.' manage.py test -v 3 --keepdb
         coverage xml
 
     - name: Upload coverage to Codecov

diff --git a/requirements.txt b/requirements.txt
@@ -24,8 +24,8 @@ schema-sync==0.9.7
 parsedatetime==2.4
 sshtunnel==0.1.5
 pycryptodome==3.10.1
-pandas==1.1.5
-pyodps==0.10.7.1
+pyodps==0.*
+pandas==1.5.*
 clickhouse-driver==0.2.3
 djangorestframework==3.13.1
 djangorestframework-simplejwt==5.2.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ omit =
		src*
		downloads*
		sql/migrations/*