Skip to content

Commit 31dd1c5

Browse files
meshymeshy
authored
Merge pull request #241 from classy-python/remove-postgres-support
Remove PostgreSQL support
2 parents d68ae31 + bae7882 commit 31dd1c5

14 files changed

Lines changed: 204 additions & 256 deletions

‎.github/workflows/python-tests.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,6 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88

9-
services:
10-
postgres:
11-
image: postgres:13.4
12-
env:
13-
POSTGRES_DB: ccbv
14-
POSTGRES_USER: classy
15-
POSTGRES_PASSWORD: classy
16-
ports:
17-
- 5432:5432
18-
options: >-
19-
--health-cmd pg_isready
20-
--health-interval 10s
21-
--health-timeout 5s
22-
--health-retries 5
23-
249
steps:
2510
- name: Clone code
2611
uses: actions/checkout@v3
@@ -42,8 +27,6 @@ jobs:
4227
pre-commit run --all-files --show-diff-on-failure
4328
4429
- name: Run Python tests
45-
env:
46-
DATABASE_URL: postgres://classy:classy@localhost/ccbv
4730
run: |
4831
make test
4932

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ build: _uv
2222
uv pip install -r requirements.prod.txt -r requirements.dev.txt
2323
python manage.py collectstatic --no-input
2424
rm --force ccbv.sqlite
25-
DATABASE_URL=sqlite:///ccbv.sqlite python manage.py migrate
26-
DATABASE_URL=sqlite:///ccbv.sqlite python manage.py load_all_django_versions
25+
python manage.py migrate
26+
python manage.py load_all_django_versions
2727

2828
run-prod:
29-
DATABASE_URL=sqlite:///ccbv.sqlite gunicorn core.wsgi --log-file -
29+
gunicorn core.wsgi --log-file -
3030

3131
compile: _uv
3232
uv pip compile requirements.prod.in --output-file=requirements.prod.txt

‎core/settings.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646

4747
WSGI_APPLICATION = "core.wsgi.application"
4848

49-
DATABASES = {
50-
"default": env.dj_db_url("DATABASE_URL", default="postgres://localhost/ccbv")
51-
}
49+
DATABASES = {"default": env.dj_db_url("DATABASE_URL", default="sqlite:///ccbv.sqlite")}
5250

5351
LANGUAGE_CODE = "en"
5452
TIME_ZONE = "Europe/London"

‎env.sh‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎requirements.prod.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ django-pygmy
66
django-sans-db>=1.2.0
77
environs[django]
88
gunicorn
9-
psycopg2-binary>=2.9.5
109
requests
1110
# New versions aren't supported yet
1211
sphinx==1.2.2

‎requirements.prod.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ marshmallow==3.18.0
4242
# via environs
4343
packaging==21.3
4444
# via marshmallow
45-
psycopg2-binary==2.9.5
46-
# via -r requirements.prod.in
4745
pygments==2.10.0
4846
# via
4947
# django-pygmy

‎tests/_page_snapshots/fuzzy-klass-detail-old.html‎

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
<a class="brand" href="/">ccbv.co.uk</a>
3838
<ul class="nav">
3939

40-
41-
42-
<li class="dropdown">
40+
<li class="dropdown">
4341

4442
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
4543
Django 3.2 <b class="caret"></b>
@@ -382,7 +380,6 @@
382380

383381

384382

385-
386383
</ul>
387384
</div>
388385
</div>
@@ -670,6 +667,54 @@ <h2>Methods</h2>
670667

671668

672669

670+
<details class="method accordion-group">
671+
<summary class="accordion-heading btn">
672+
<h3>
673+
<code class="signature highlight">
674+
<span class="k">def</span>
675+
<span class="nf">__init__</span>(<span class="n">self, **kwargs</span>):
676+
</code>
677+
678+
<small class="pull-right">View</small>
679+
680+
<a class="permalink" href="/projects/Django/3.2/django.views.generic.edit/FormView/#__init__">&para;</a>
681+
</h3>
682+
</summary>
683+
<div id="__init__" class="accordion-body">
684+
685+
686+
<pre class="docstring">Constructor. Called in the URLconf; can contain helpful extra
687+
keyword arguments, and other things.</pre>
688+
<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">38</span>
689+
<span class="normal">39</span>
690+
<span class="normal">40</span>
691+
<span class="normal">41</span>
692+
<span class="normal">42</span>
693+
<span class="normal">43</span>
694+
<span class="normal">44</span>
695+
<span class="normal">45</span>
696+
<span class="normal">46</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
697+
<span class="sd">&quot;&quot;&quot;</span>
698+
<span class="sd"> Constructor. Called in the URLconf; can contain helpful extra</span>
699+
<span class="sd"> keyword arguments, and other things.</span>
700+
<span class="sd"> &quot;&quot;&quot;</span>
701+
<span class="c1"># Go through keyword arguments, and either save their values to our</span>
702+
<span class="c1"># instance, or raise an error.</span>
703+
<span class="k">for</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span> <span class="ow">in</span> <span class="n">kwargs</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
704+
<span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
705+
</pre></div>
706+
</td></tr></table>
707+
708+
709+
</div>
710+
</details>
711+
712+
713+
714+
715+
716+
717+
673718
<details class="method accordion-group">
674719
<summary class="accordion-heading btn">
675720
<h3>
@@ -1347,54 +1392,6 @@ <h3>
13471392

13481393

13491394

1350-
<details class="method accordion-group">
1351-
<summary class="accordion-heading btn">
1352-
<h3>
1353-
<code class="signature highlight">
1354-
<span class="k">def</span>
1355-
<span class="nf">__init__</span>(<span class="n">self, **kwargs</span>):
1356-
</code>
1357-
1358-
<small class="pull-right">View</small>
1359-
1360-
<a class="permalink" href="/projects/Django/3.2/django.views.generic.edit/FormView/#__init__">&para;</a>
1361-
</h3>
1362-
</summary>
1363-
<div id="__init__" class="accordion-body">
1364-
1365-
1366-
<pre class="docstring">Constructor. Called in the URLconf; can contain helpful extra
1367-
keyword arguments, and other things.</pre>
1368-
<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">38</span>
1369-
<span class="normal">39</span>
1370-
<span class="normal">40</span>
1371-
<span class="normal">41</span>
1372-
<span class="normal">42</span>
1373-
<span class="normal">43</span>
1374-
<span class="normal">44</span>
1375-
<span class="normal">45</span>
1376-
<span class="normal">46</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
1377-
<span class="sd">&quot;&quot;&quot;</span>
1378-
<span class="sd"> Constructor. Called in the URLconf; can contain helpful extra</span>
1379-
<span class="sd"> keyword arguments, and other things.</span>
1380-
<span class="sd"> &quot;&quot;&quot;</span>
1381-
<span class="c1"># Go through keyword arguments, and either save their values to our</span>
1382-
<span class="c1"># instance, or raise an error.</span>
1383-
<span class="k">for</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span> <span class="ow">in</span> <span class="n">kwargs</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
1384-
<span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
1385-
</pre></div>
1386-
</td></tr></table>
1387-
1388-
1389-
</div>
1390-
</details>
1391-
1392-
1393-
1394-
1395-
1396-
1397-
13981395
<details class="method accordion-group">
13991396
<summary class="accordion-heading btn">
14001397
<h3>

‎tests/_page_snapshots/fuzzy-klass-detail.html‎

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
<a class="brand" href="/">ccbv.co.uk</a>
3838
<ul class="nav">
3939

40-
41-
42-
<li class="dropdown">
40+
<li class="dropdown">
4341

4442
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
4543
Django 4.0 <b class="caret"></b>
@@ -382,7 +380,6 @@
382380

383381

384382

385-
386383
</ul>
387384
</div>
388385
</div>
@@ -670,6 +667,54 @@ <h2>Methods</h2>
670667

671668

672669

670+
<details class="method accordion-group">
671+
<summary class="accordion-heading btn">
672+
<h3>
673+
<code class="signature highlight">
674+
<span class="k">def</span>
675+
<span class="nf">__init__</span>(<span class="n">self, **kwargs</span>):
676+
</code>
677+
678+
<small class="pull-right">View</small>
679+
680+
<a class="permalink" href="/projects/Django/4.0/django.views.generic.edit/FormView/#__init__">&para;</a>
681+
</h3>
682+
</summary>
683+
<div id="__init__" class="accordion-body">
684+
685+
686+
<pre class="docstring">Constructor. Called in the URLconf; can contain helpful extra
687+
keyword arguments, and other things.</pre>
688+
<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">37</span>
689+
<span class="normal">38</span>
690+
<span class="normal">39</span>
691+
<span class="normal">40</span>
692+
<span class="normal">41</span>
693+
<span class="normal">42</span>
694+
<span class="normal">43</span>
695+
<span class="normal">44</span>
696+
<span class="normal">45</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
697+
<span class="sd">&quot;&quot;&quot;</span>
698+
<span class="sd"> Constructor. Called in the URLconf; can contain helpful extra</span>
699+
<span class="sd"> keyword arguments, and other things.</span>
700+
<span class="sd"> &quot;&quot;&quot;</span>
701+
<span class="c1"># Go through keyword arguments, and either save their values to our</span>
702+
<span class="c1"># instance, or raise an error.</span>
703+
<span class="k">for</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span> <span class="ow">in</span> <span class="n">kwargs</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
704+
<span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
705+
</pre></div>
706+
</td></tr></table>
707+
708+
709+
</div>
710+
</details>
711+
712+
713+
714+
715+
716+
717+
673718
<details class="method accordion-group">
674719
<summary class="accordion-heading btn">
675720
<h3>
@@ -1355,54 +1400,6 @@ <h3>
13551400

13561401

13571402

1358-
<details class="method accordion-group">
1359-
<summary class="accordion-heading btn">
1360-
<h3>
1361-
<code class="signature highlight">
1362-
<span class="k">def</span>
1363-
<span class="nf">__init__</span>(<span class="n">self, **kwargs</span>):
1364-
</code>
1365-
1366-
<small class="pull-right">View</small>
1367-
1368-
<a class="permalink" href="/projects/Django/4.0/django.views.generic.edit/FormView/#__init__">&para;</a>
1369-
</h3>
1370-
</summary>
1371-
<div id="__init__" class="accordion-body">
1372-
1373-
1374-
<pre class="docstring">Constructor. Called in the URLconf; can contain helpful extra
1375-
keyword arguments, and other things.</pre>
1376-
<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">37</span>
1377-
<span class="normal">38</span>
1378-
<span class="normal">39</span>
1379-
<span class="normal">40</span>
1380-
<span class="normal">41</span>
1381-
<span class="normal">42</span>
1382-
<span class="normal">43</span>
1383-
<span class="normal">44</span>
1384-
<span class="normal">45</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
1385-
<span class="sd">&quot;&quot;&quot;</span>
1386-
<span class="sd"> Constructor. Called in the URLconf; can contain helpful extra</span>
1387-
<span class="sd"> keyword arguments, and other things.</span>
1388-
<span class="sd"> &quot;&quot;&quot;</span>
1389-
<span class="c1"># Go through keyword arguments, and either save their values to our</span>
1390-
<span class="c1"># instance, or raise an error.</span>
1391-
<span class="k">for</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span> <span class="ow">in</span> <span class="n">kwargs</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
1392-
<span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
1393-
</pre></div>
1394-
</td></tr></table>
1395-
1396-
1397-
</div>
1398-
</details>
1399-
1400-
1401-
1402-
1403-
1404-
1405-
14061403
<details class="method accordion-group">
14071404
<summary class="accordion-heading btn">
14081405
<h3>

‎tests/_page_snapshots/fuzzy-module-detail.html‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
<a class="brand" href="/">ccbv.co.uk</a>
3333
<ul class="nav">
3434

35-
36-
37-
<li class="dropdown">
35+
<li class="dropdown">
3836

3937
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
4038
Django 4.0 <b class="caret"></b>
@@ -377,7 +375,6 @@
377375

378376

379377

380-
381378
</ul>
382379
</div>
383380
</div>

‎tests/_page_snapshots/homepage.html‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
<a class="brand" href="/">ccbv.co.uk</a>
2727
<ul class="nav">
2828

29-
30-
31-
<li class="dropdown">
29+
<li class="dropdown">
3230

3331
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
3432
Django 4.0 <b class="caret"></b>
@@ -371,7 +369,6 @@
371369

372370

373371

374-
375372
</ul>
376373
</div>
377374
</div>

0 commit comments

Comments
 (0)