Skip to content

Commit 91ce95c

Browse files
freakboy3742freakboy3742
authored
Merge pull request #984 from freakboy3742/rework-web
Rework web backend
2 parents 6e1409a + 179563a commit 91ce95c

File tree

105 files changed

+1212
-1477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1212
-1477
lines changed

‎.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ jobs:
200200
cd src/android
201201
python setup.py test
202202
203-
django:
204-
name: Django backend tests
203+
web:
204+
name: Web backend tests
205205
needs: python-versions
206206
runs-on: ubuntu-latest
207207
steps:
@@ -217,8 +217,8 @@ jobs:
217217
python -m pip install pytest-tldr
218218
python -m pip install -e src/core
219219
python -m pip install -e src/dummy
220-
python -m pip install -e src/django
220+
python -m pip install -e src/web
221221
- name: Test
222222
run: |
223-
cd src/django
223+
cd src/web
224224
python setup.py test

‎nursery/flask/CONTRIBUTING.md ‎nursery/falcon/CONTRIBUTING.md

File renamed without changes.

‎nursery/flask/MANIFEST.in ‎nursery/falcon/MANIFEST.in

File renamed without changes.

‎nursery/flask/README.rst ‎nursery/falcon/README.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
toga-flask
2-
==========
1+
toga-falcon
2+
===========
33

4-
A Flask backend for the `Toga widget toolkit`_.
4+
A `Falcon <https://falconframework.org>`__ backend for the `Toga widget toolkit`_.
55

66
**Toga requires Python 3**
77

@@ -36,4 +36,4 @@ want to contribute code, please `fork the code`_ and `submit a pull request`_.
3636
.. _beeware/general: https://gitter.im/beeware/general
3737
.. _log them on Github: https://github.com/beeware/toga/issues
3838
.. _fork the code: https://github.com/beeware/toga
39-
.. _submit a pull request: https://github.com/beeware/toga/pulls
39+
.. _submit a pull request: https://github.com/beeware/toga/pulls

‎nursery/falcon/setup.cfg

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
[metadata]
2+
name = toga-falcon
3+
description = A Falcon backend for the Toga widget toolkit.
4+
url = https://beeware.org/project/projects/libraries/toga/
5+
project_urls =
6+
Funding = https://beeware.org/contributing/membership/
7+
Documentation = http://toga.readthedocs.io/en/latest/
8+
Tracker = https://github.com/beeware/toga/issues
9+
Source = https://github.com/beeware/toga
10+
author = Russell Keith-Magee
11+
author_email = [email protected]
12+
maintainer = BeeWare Team
13+
maintainer_email = [email protected]
14+
classifiers =
15+
Development Status :: 3 - Alpha
16+
Intended Audience :: Developers
17+
License :: OSI Approved :: BSD License
18+
Operating System :: OS Independent
19+
Programming Language :: Python :: 3
20+
Programming Language :: Python :: 3.5
21+
Programming Language :: Python :: 3.6
22+
Programming Language :: Python :: 3.7
23+
Programming Language :: Python :: 3.8
24+
Programming Language :: Python :: 3 :: Only
25+
Topic :: Software Development
26+
Topic :: Software Development :: User Interfaces
27+
Topic :: Software Development :: Widget Sets
28+
license = New BSD
29+
license_file = LICENSE
30+
long-description = file: README.rst
31+
long_description_content_type = text/x-rst; charset=UTF-8
32+
keywords =
33+
gui
34+
widget
35+
cross-platform
36+
toga
37+
web
38+
falcon
39+
40+
[options]
41+
packages = find:
42+
python_requires = >= 3.5
43+
zip_safe = False
44+
45+
[options.packages.find]
46+
include =
47+
toga_falcon
48+
toga_falcon.*
49+
50+
[flake8]
51+
exclude=\
52+
.eggs/*,\
53+
build/*
54+
max-complexity = 10
55+
max-line-length = 119
56+
ignore = E121,E123,E126,E226,E24,E704,W503,W504,C901
57+
58+
[isort]
59+
multi_line_output = 3

‎nursery/falcon/setup.py

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/env python
2+
import re
3+
4+
from setuptools import setup
5+
6+
# Version handline needs to be programatic because
7+
# we can't import toga_falcon to compute the version;
8+
# and to support versioned subpackage dependencies
9+
with open('toga_falcon/__init__.py', encoding='utf8') as version_file:
10+
version_match = re.search(
11+
r"^__version__ = ['\"]([^'\"]*)['\"]",
12+
version_file.read(),
13+
re.M
14+
)
15+
if version_match:
16+
version = version_match.group(1)
17+
else:
18+
raise RuntimeError("Unable to find version string.")
19+
20+
setup(
21+
version=version,
22+
install_requires=[
23+
'toga-core==%s' % version,
24+
],
25+
)

‎nursery/flask/tests/__init__.py ‎nursery/falcon/tests/__init__.py

File renamed without changes.

‎src/django/tests/test_implementation.py ‎nursery/falcon/tests/test_implementation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
os.path.abspath(
88
os.path.join(
99
os.path.dirname(os.path.dirname(__file__)),
10-
'toga_django')
10+
'toga_falcon')
1111
)
1212
)
1313
)

‎nursery/flask/toga_flask/__init__.py ‎nursery/falcon/toga_falcon/__init__.py

File renamed without changes.

‎nursery/pyramid/README.rst

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
toga-pyramid
22
============
33

4-
A Pyramid backend for the `Toga widget toolkit`_.
5-
6-
**Toga requires Python 3**
4+
A `Pyramid <https://trypyramid.com>`__ backend for the `Toga widget toolkit`_.
75

86
**THIS IS A PLACEHOLDER PROJECT**
97

‎nursery/web/CONTRIBUTING.md ‎nursery/starlette/CONTRIBUTING.md

File renamed without changes.

‎nursery/web/MANIFEST.in ‎nursery/starlette/MANIFEST.in

File renamed without changes.

‎nursery/starlette/README.rst

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
toga-starlette
2+
==============
3+
4+
A `Starlette <https://www.starlette.io>`__ backend for the `Toga widget toolkit`_.
5+
6+
**Toga requires Python 3**
7+
8+
**THIS IS A PLACEHOLDER PROJECT**
9+
10+
At present, it has no functionality - it exists purely to reserve the PyPI namespace.
11+
12+
This package isn't much use by itself; it needs to be combined with `the core Toga library`_.
13+
14+
For more details, see the `Toga project on Github`_.
15+
16+
Community
17+
---------
18+
19+
Toga is part of the `BeeWare suite`_. You can talk to the community through:
20+
21+
* `@pybeeware on Twitter`_
22+
23+
* The `beeware/general`_ channel on Gitter.
24+
25+
Contributing
26+
------------
27+
28+
If you experience problems with this backend, `log them on GitHub`_. If you
29+
want to contribute code, please `fork the code`_ and `submit a pull request`_.
30+
31+
.. _Toga widget toolkit: http://beeware.org/toga
32+
.. _the core Toga library: https://pypi.python.org/pypi/toga-core
33+
.. _Toga project on Github: https://github.com/beeware/toga
34+
.. _BeeWare suite: http://beeware.org
35+
.. _@pybeeware on Twitter: https://twitter.com/pybeeware
36+
.. _beeware/general: https://gitter.im/beeware/general
37+
.. _log them on Github: https://github.com/beeware/toga/issues
38+
.. _fork the code: https://github.com/beeware/toga
39+
.. _submit a pull request: https://github.com/beeware/toga/pulls

‎nursery/starlette/setup.cfg

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
[metadata]
2+
name = toga-starlette
3+
description = A Starlette backend for the Toga widget toolkit.
4+
url = https://beeware.org/project/projects/libraries/toga/
5+
project_urls =
6+
Funding = https://beeware.org/contributing/membership/
7+
Documentation = http://toga.readthedocs.io/en/latest/
8+
Tracker = https://github.com/beeware/toga/issues
9+
Source = https://github.com/beeware/toga
10+
author = Russell Keith-Magee
11+
author_email = [email protected]
12+
maintainer = BeeWare Team
13+
maintainer_email = [email protected]
14+
classifiers =
15+
Development Status :: 3 - Alpha
16+
Intended Audience :: Developers
17+
License :: OSI Approved :: BSD License
18+
Operating System :: OS Independent
19+
Programming Language :: Python :: 3
20+
Programming Language :: Python :: 3.5
21+
Programming Language :: Python :: 3.6
22+
Programming Language :: Python :: 3.7
23+
Programming Language :: Python :: 3.8
24+
Programming Language :: Python :: 3 :: Only
25+
Topic :: Software Development
26+
Topic :: Software Development :: User Interfaces
27+
Topic :: Software Development :: Widget Sets
28+
license = New BSD
29+
license_file = LICENSE
30+
long-description = file: README.rst
31+
long_description_content_type = text/x-rst; charset=UTF-8
32+
keywords =
33+
gui
34+
widget
35+
cross-platform
36+
toga
37+
web
38+
starlette
39+
40+
[options]
41+
packages = find:
42+
python_requires = >= 3.5
43+
zip_safe = False
44+
45+
[options.packages.find]
46+
include =
47+
toga_starlette
48+
toga_starlette.*
49+
50+
[flake8]
51+
exclude=\
52+
.eggs/*,\
53+
build/*
54+
max-complexity = 10
55+
max-line-length = 119
56+
ignore = E121,E123,E126,E226,E24,E704,W503,W504,C901
57+
58+
[isort]
59+
multi_line_output = 3

‎nursery/starlette/setup.py

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/env python
2+
import re
3+
4+
from setuptools import setup
5+
6+
# Version handline needs to be programatic because
7+
# we can't import toga_starlette to compute the version;
8+
# and to support versioned subpackage dependencies
9+
with open('toga_starlette/__init__.py', encoding='utf8') as version_file:
10+
version_match = re.search(
11+
r"^__version__ = ['\"]([^'\"]*)['\"]",
12+
version_file.read(),
13+
re.M
14+
)
15+
if version_match:
16+
version = version_match.group(1)
17+
else:
18+
raise RuntimeError("Unable to find version string.")
19+
20+
setup(
21+
version=version,
22+
install_requires=[
23+
'toga-core==%s' % version,
24+
],
25+
)

‎nursery/web/tests/__init__.py ‎nursery/starlette/tests/__init__.py

File renamed without changes.

‎nursery/flask/tests/test_implementation.py ‎nursery/starlette/tests/test_implementation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
os.path.abspath(
88
os.path.join(
99
os.path.dirname(os.path.dirname(__file__)),
10-
'toga_flask')
10+
'toga_pyramid')
1111
)
1212
)
1313
)

‎nursery/web/toga_web/__init__.py ‎nursery/starlette/toga_starlette/__init__.py

File renamed without changes.

‎nursery/tornado/CONTRIBUTING.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Contributing
2+
3+
BeeWare <3's contributions!
4+
5+
Please be aware, BeeWare operates under a Code of Conduct.
6+
7+
See [CONTRIBUTING to BeeWare](https://beeware.org/contributing/) for details.
8+

‎nursery/tornado/MANIFEST.in

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
include CONTRIBUTING.md
2+
include LICENSE
3+
include README.rst
4+
recursive-include tests *.py
5+
recursive-include toga_cocoa *.py

‎nursery/web/README.rst ‎nursery/tornado/README.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
toga-web
2-
========
1+
toga-tornado
2+
============
33

4-
A common backend for the `Toga widget toolkit`_ on web platforms.
4+
A `Tornado <https://www.tornadoweb.org>`__ backend for the `Toga widget toolkit`_.
55

66
**Toga requires Python 3**
77

‎nursery/tornado/setup.cfg

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
[metadata]
2+
name = toga-tornado
3+
description = A Tornado backend for the Toga widget toolkit.
4+
url = https://beeware.org/project/projects/libraries/toga/
5+
project_urls =
6+
Funding = https://beeware.org/contributing/membership/
7+
Documentation = http://toga.readthedocs.io/en/latest/
8+
Tracker = https://github.com/beeware/toga/issues
9+
Source = https://github.com/beeware/toga
10+
author = Russell Keith-Magee
11+
author_email = [email protected]
12+
maintainer = BeeWare Team
13+
maintainer_email = [email protected]
14+
classifiers =
15+
Development Status :: 3 - Alpha
16+
Intended Audience :: Developers
17+
License :: OSI Approved :: BSD License
18+
Operating System :: OS Independent
19+
Programming Language :: Python :: 3
20+
Programming Language :: Python :: 3.5
21+
Programming Language :: Python :: 3.6
22+
Programming Language :: Python :: 3.7
23+
Programming Language :: Python :: 3.8
24+
Programming Language :: Python :: 3 :: Only
25+
Topic :: Software Development
26+
Topic :: Software Development :: User Interfaces
27+
Topic :: Software Development :: Widget Sets
28+
license = New BSD
29+
license_file = LICENSE
30+
long-description = file: README.rst
31+
long_description_content_type = text/x-rst; charset=UTF-8
32+
keywords =
33+
gui
34+
widget
35+
cross-platform
36+
toga
37+
web
38+
tornado
39+
40+
[options]
41+
packages = find:
42+
python_requires = >= 3.5
43+
zip_safe = False
44+
45+
[options.packages.find]
46+
include =
47+
toga_tornado
48+
toga_tornado.*
49+
50+
[flake8]
51+
exclude=\
52+
.eggs/*,\
53+
build/*
54+
max-complexity = 10
55+
max-line-length = 119
56+
ignore = E121,E123,E126,E226,E24,E704,W503,W504,C901
57+
58+
[isort]
59+
multi_line_output = 3

‎nursery/tornado/setup.py

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/env python
2+
import re
3+
4+
from setuptools import setup
5+
6+
# Version handline needs to be programatic because
7+
# we can't import toga_tornado to compute the version;
8+
# and to support versioned subpackage dependencies
9+
with open('toga_tornado/__init__.py', encoding='utf8') as version_file:
10+
version_match = re.search(
11+
r"^__version__ = ['\"]([^'\"]*)['\"]",
12+
version_file.read(),
13+
re.M
14+
)
15+
if version_match:
16+
version = version_match.group(1)
17+
else:
18+
raise RuntimeError("Unable to find version string.")
19+
20+
setup(
21+
version=version,
22+
install_requires=[
23+
'toga-core==%s' % version,
24+
],
25+
)

‎src/django/tests/__init__.py ‎nursery/tornado/tests/__init__.py

File renamed without changes.

0 commit comments

Comments
 (0)