Skip to content

Commit

Permalink
update library versions
Browse files Browse the repository at this point in the history
  • Loading branch information
sheppard committed Feb 20, 2023
1 parent 8a3222d commit fb19dec
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 32 deletions.
39 changes: 17 additions & 22 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,32 @@ on: [push, pull_request]
jobs:
build:
name: ${{ matrix.variant }} py=${{ matrix.python-version }} dj=${{ matrix.django-version }} drf=${{ matrix.drf-version }} pandas=${{ matrix.pandas-version }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
TEST_VARIANT: ${{ matrix.variant }}
strategy:
matrix:
python-version: ["3.10", "3.9", "3.8"]
django-version: [4.0.6]
drf-version: [3.13.1]
pandas-version: [1.4.3]
python-version: ["3.11", "3.10", "3.9", "3.8"]
django-version: [4.1.7]
drf-version: [3.14.0]
pandas-version: [1.5.3]
variant: ['']
include:
- python-version: "3.10"
django-version: 4.0.6
drf-version: 3.13.1
pandas-version: 1.4.3
- python-version: "3.11"
django-version: 4.1.7
drf-version: 3.14.0
pandas-version: 1.5.3
variant: matplotlib
- python-version: "3.10"
django-version: 4.0.6
drf-version: 3.13.1
pandas-version: 1.4.3
- python-version: "3.11"
django-version: 4.1.7
drf-version: 3.14.0
pandas-version: 1.5.3
variant: django-pandas
- python-version: "3.10"
- python-version: "3.11"
django-version: 3.2.14
drf-version: 3.13.1
pandas-version: 1.4.3
variant: ''
- python-version: "3.7"
django-version: 3.2.14
drf-version: 3.13.1
pandas-version: 1.3.5
variant: ''
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -66,13 +61,13 @@ jobs:
run: python -m unittest discover -s tests -t . -v
npm:
name: "@wq/${{ matrix.package }}"
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
PACKAGE: ${{ matrix.package }}
strategy:
matrix:
python-version: ["3.10"]
node-version: [16]
python-version: ["3.11"]
node-version: [18]
package:
- pandas
- chart
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2014-2019, S. Andrew Sheppard, https://wq.io/
Copyright (c) 2014-2023, S. Andrew Sheppard, https://wq.io/

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ def readme():
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Topic :: Scientific/Engineering :: Information Analysis",
"Topic :: Scientific/Engineering :: Visualization",
],
Expand Down
9 changes: 5 additions & 4 deletions tests/files/multitimeseries.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
<html lang="en-us" dir="ltr">
<head>
<title>Multi Time Series</title>
<link rel="stylesheet" type="text/css" href="admin/css/base.css">
<link rel="stylesheet" href="admin/css/base.css">
<link href="admin/css/dark_mode.css" rel="stylesheet">


<link rel="stylesheet" type="text/css" href="admin/css/forms.css">
<link rel="stylesheet" href="admin/css/forms.css" type="text/css">




<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" type="text/css" href="admin/css/responsive.css">
<link rel="stylesheet" href="admin/css/responsive.css">


<meta name="robots" content="NONE,NOARCHIVE">
</head>

<body class=""
data-admin-utc-offset="-18000">
data-admin-utc-offset="0">

<!-- Container -->
<div id="container">
Expand Down
9 changes: 5 additions & 4 deletions tests/files/timeseries.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
<html lang="en-us" dir="ltr">
<head>
<title>Time Series Custom</title>
<link rel="stylesheet" type="text/css" href="admin/css/base.css">
<link rel="stylesheet" href="admin/css/base.css">
<link href="admin/css/dark_mode.css" rel="stylesheet">


<link rel="stylesheet" type="text/css" href="admin/css/forms.css">
<link rel="stylesheet" href="admin/css/forms.css" type="text/css">




<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" type="text/css" href="admin/css/responsive.css">
<link rel="stylesheet" href="admin/css/responsive.css">


<meta name="robots" content="NONE,NOARCHIVE">
</head>

<body class=""
data-admin-utc-offset="-18000">
data-admin-utc-offset="0">

<!-- Container -->
<div id="container">
Expand Down
1 change: 1 addition & 0 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
},
]

TIME_ZONE = "UTC"
DEBUG = True


Expand Down
4 changes: 3 additions & 1 deletion tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@


class PandasTestCase(APITestCase):
maxDiff = None

def setUp(self):
data = (
("2014-01-01", 0.5),
Expand Down Expand Up @@ -60,7 +62,7 @@ def test_view_json(self):
self.assertIn("id", data[0])
self.assertEqual(data[0]["id"], 1)
self.assertEqual(data[0]["value"], 0.5)
self.assertEqual(data[0]["date"], "2014-01-01T00:00:00.000Z")
self.assertEqual(data[0]["date"], "2014-01-01T00:00:00.000")

def test_view_json_kwargs(self):
response = self.client.get("/timeseries.json?date_format=epoch")
Expand Down

0 comments on commit fb19dec

Please sign in to comment.