Skip to content

Commit b18d674

Browse files
slott56slott56
authored
Merge pull request #7 from slott56/dev
Cleanup structure to permit clean single-module install
2 parents e6d472d + 7724db4 commit b18d674

61 files changed

Lines changed: 527 additions & 460 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@
99
objects.inv
1010
_build/doctrees/*.doctree
1111
_build/doctrees/*.pickle
12+
_build/doctrees/*/*.doctree
13+
_build/doctrees/*/*.pickle

‎Makefile‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,66 +25,66 @@ help:
2525
@echo " linkcheck to check all external links for integrity"
2626

2727
docs/conf.py.txt: docs/conf.py
28-
python3 src/pylit.py docs/conf.py
28+
python3 pylit.py docs/conf.py
2929

3030
docs/examples/setup.py.txt: setup.py
31-
python3 src/pylit.py setup.py docs/examples/setup.py.txt
31+
python3 pylit.py setup.py docs/examples/setup.py.txt
3232

33-
docs/examples/pylit.py.txt: src/pylit.py
34-
python3 src/pylit.py src/pylit.py docs/examples/pylit.py.txt
33+
docs/examples/pylit.py.txt: pylit.py
34+
python3 pylit.py pylit.py docs/examples/pylit.py.txt
3535

3636
docs/examples/pylit_test.py.txt: test/pylit_test.py
37-
python3 src/pylit.py --comment-string='## ' test/pylit_test.py docs/examples/pylit_test.py.txt
37+
python3 pylit.py --comment-string='## ' test/pylit_test.py docs/examples/pylit_test.py.txt
3838

3939
docs/tutorial/hello.py.txt: docs/tutorial/hello.py
40-
python3 src/pylit.py docs/tutorial/hello.py
40+
python3 pylit.py docs/tutorial/hello.py
4141

4242
docs/tutorial/hello_2.py: docs/tutorial/hello_2.py.txt
43-
python3 src/pylit.py docs/tutorial/hello_2.py.txt
43+
python3 pylit.py docs/tutorial/hello_2.py.txt
4444

4545
docs/tutorial/hello_with_header.py: docs/tutorial/hello_with_header.py.txt
46-
python3 src/pylit.py docs/tutorial/hello_with_header.py.txt
46+
python3 pylit.py docs/tutorial/hello_with_header.py.txt
4747

4848
docs/tutorial/hello_with_doctest.py.txt: docs/tutorial/hello_with_doctest.py
49-
python3 src/pylit.py --doctest docs/tutorial/hello_with_doctest.py
50-
python3 src/pylit.py docs/tutorial/hello_with_doctest.py
49+
python3 pylit.py --doctest docs/tutorial/hello_with_doctest.py
50+
python3 pylit.py docs/tutorial/hello_with_doctest.py
5151

5252
docs/tutorial/hello_with_doctest_2.py.txt: docs/tutorial/hello_with_doctest_2.py
53-
python3 src/pylit.py --doctest docs/tutorial/hello_with_doctest_2.py
54-
python3 src/pylit.py docs/tutorial/hello_with_doctest_2.py
53+
python3 pylit.py --doctest docs/tutorial/hello_with_doctest_2.py
54+
python3 pylit.py docs/tutorial/hello_with_doctest_2.py
5555

5656
docs/tutorial/greeting.py.txt: docs/tutorial/greeting.py
57-
python3 src/pylit.py docs/tutorial/greeting.py
57+
python3 pylit.py docs/tutorial/greeting.py
5858

5959
docs/tutorial/hello_multifile.py.txt: docs/tutorial/hello_multifile.py docs/tutorial/greeting.py.txt
60-
python3 src/pylit.py docs/tutorial/hello_multifile.py
60+
python3 pylit.py docs/tutorial/hello_multifile.py
6161

6262
docs/examples/simplestates.py: docs/examples/simplestates.py.txt
63-
python3 src/pylit.py docs/examples/simplestates.py.txt
63+
python3 pylit.py docs/examples/simplestates.py.txt
6464

6565
docs/examples/simplestates_test.py: docs/examples/simplestates_test.py.txt
66-
python3 src/pylit.py docs/examples/simplestates_test.py.txt
66+
python3 pylit.py docs/examples/simplestates_test.py.txt
6767
(cd docs/examples; python3 simplestates_test.py)
6868

6969
docs/examples/iterqueue.py: docs/examples/iterqueue.py.txt
70-
python3 src/pylit.py docs/examples/iterqueue.py.txt
71-
(cd docs/examples; python3 ../../src/pylit.py --doctest iterqueue.py.txt)
70+
python3 pylit.py docs/examples/iterqueue.py.txt
71+
(cd docs/examples; python3 ../../pylit.py --doctest iterqueue.py.txt)
7272

7373
docs/examples/iterqueue_test.py: docs/examples/iterqueue_test.py.txt
74-
python3 src/pylit.py docs/examples/iterqueue_test.py.txt
74+
python3 pylit.py docs/examples/iterqueue_test.py.txt
7575
(cd docs/examples; python3 iterqueue_test.py)
7676

7777
docs/examples/iterqueue_speed_test.py: docs/examples/iterqueue_speed_test.py.txt
78-
python3 src/pylit.py docs/examples/iterqueue_speed_test.py.txt
78+
python3 pylit.py docs/examples/iterqueue_speed_test.py.txt
7979
(cd docs/examples; python3 iterqueue_speed_test.py)
8080

8181
docs/examples/testfile_literate.py: docs/examples/testfile_literate.py.txt
82-
python3 src/pylit.py docs/examples/testfile_literate.py.txt
82+
python3 pylit.py docs/examples/testfile_literate.py.txt
8383
(cd docs/examples; python3 -m doctest -v testfile_literate.py.txt )
8484

8585
docs/examples/testmod_literate.py: docs/examples/testmod_literate.py.txt
86-
python3 src/pylit.py docs/examples/testmod_literate.py.txt
87-
(cd docs/examples; PYTHONPATH=../../src python3 testmod_literate.py )
86+
python3 pylit.py docs/examples/testmod_literate.py.txt
87+
(cd docs/examples; PYTHONPATH=../.. python3 testmod_literate.py )
8888

8989
OTHERS = docs/conf.py.txt \
9090
docs/examples/pylit.py.txt \

‎PyLit.egg-info/PKG-INFO‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,43 @@
11
Metadata-Version: 1.2
2-
Name: PyLit
2+
Name: pylit
33
Version: 3.1.1
44
Summary: Python Literate Programming
5-
Home-page: UNKNOWN
5+
Home-page: https://github.com/slott56/PyLit-3
66
Author: S.Lott
77
Author-email: slott56@gmail.com
88
License: GNU General Public License (v. 2 or later)
9-
Project-URL: Documentation, http://developer.berlios.de/svn/?group_id=7974
9+
Project-URL: Documentation, https://slott56.github.io/PyLit-3/index.html
1010
Project-URL: Source Code, https://github.com/slott56/PyLit-3
1111
Project-URL: Bug Tracker, https://github.com/slott56/PyLit-3/issues
12-
Description: UNKNOWN
12+
Description: ############
13+
PyLit 3.1
14+
############
15+
16+
17+
See http://slott56.github.io/PyLit-3/index.html for the complete documentation.
18+
19+
The ``Makefile`` is used via ``make html`` to rebuild the code and documentation.
20+
21+
The ``docs`` directory contains the documentation, plus many examples.
22+
23+
The ``pylit.py`` is the module.
24+
25+
The ``test`` directory contains the unit test suite.
26+
27+
The ``contribs`` directory are old contributed modules which have not yet been
28+
converted to Python3.
29+
30+
The code repository is: https://github.com/slott56/PyLit-3
31+
1332
Platform: UNKNOWN
1433
Classifier: Development Status :: 6 - Mature
1534
Classifier: Intended Audience :: Developers
1635
Classifier: Operating System :: OS Independent
1736
Classifier: Programming Language :: Python :: 3 :: Only
1837
Classifier: Topic :: Software Development :: Build Tools
19-
Requires-Python: >=3.4
38+
Provides: p
39+
Provides: y
40+
Provides: l
41+
Provides: i
42+
Provides: t
43+
Requires-Python: >=3.5

‎PyLit.egg-info/SOURCES.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
README.rst
2+
pylit.py
23
setup.py
3-
PyLit.egg-info/PKG-INFO
4-
PyLit.egg-info/SOURCES.txt
5-
PyLit.egg-info/dependency_links.txt
6-
PyLit.egg-info/top_level.txt
4+
pylit.egg-info/PKG-INFO
5+
pylit.egg-info/SOURCES.txt
6+
pylit.egg-info/dependency_links.txt
7+
pylit.egg-info/top_level.txt

‎PyLit.egg-info/top_level.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1+
pylit

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The ``Makefile`` is used via ``make html`` to rebuild the code and documentation
99

1010
The ``docs`` directory contains the documentation, plus many examples.
1111

12-
The ``src`` directory contains the installable module.
12+
The ``pylit.py`` is the module. Once you've installed it, use ``python -m pylit`` to run it.
1313

1414
The ``test`` directory contains the unit test suite.
1515

‎_build/html/_sources/download/index.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Tools
4040
https://github.com/slott56/PyLit-3
4141

4242
.. _`pylit.py`:
43-
https://github.com/slott56/PyLit-3/blob/gh-pages/src/pylit.py
43+
https://raw.githubusercontent.com/slott56/PyLit-3/master/pylit.py
4444
.. _pylit_test.py:
45-
https://github.com/slott56/PyLit-3/blob/gh-pages/test/pylit_test.py
45+
https://raw.githubusercontent.com/slott56/PyLit-3/master/test/pylit_test.py
4646

4747
.. _Docutils: http://docutils.sourceforge.net/
4848
.. _Sphinx: http://sphinx.pocoo.org/

‎_build/html/_sources/examples/literate-doctests.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ Examples
9494

9595
Test this file with::
9696

97-
MacBookPro-SLott:examples slott$ python3 ../../src/pylit.py --doctest testfile_literate.py
98-
../../src/pylit.py:1644: UserWarning: data encoding=UTF-8 != docencoding=iso-8859-1
97+
MacBookPro-SLott:examples slott$ python3 pylit.py --doctest testfile_literate.py
98+
pylit.py:1644: UserWarning: data encoding=UTF-8 != docencoding=iso-8859-1
9999
warnings.warn( "data encoding={0} != docencoding={1}".format(data.encoding, docencoding) )
100100
0 failures in 19 tests
101101

‎_build/html/_sources/examples/pylit_test.py.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Be sure that we're working with a development copy of PyLit.
3737
::
3838

3939
import sys, os
40-
sys.path.insert( 0, os.path.abspath("../src") )
40+
sys.path.insert( 0, os.path.abspath("..") )
4141
from pylit import *
4242

4343
Test DefaultDict
@@ -1259,6 +1259,6 @@ The shell command looks like this.
12591259

12601260
.. parsed-literal::
12611261

1262-
python3 src/pylit.py --comment-string='## ' test/pylit_test.py docs/examples/pylit_test.py.txt
1262+
python3 pylit.py --comment-string='## ' test/pylit_test.py docs/examples/pylit_test.py.txt
12631263

12641264
The use of ## comments makes it possible to handle "::" in the code.

‎_build/html/_sources/examples/setup.py.txt‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
.. #!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4+
********
45
setup.py
56
********
6-
Literate programming with reStructuredText
7-
++++++++++++++++++++++++++++++++++++++++++
87

9-
:Date: $Date$
10-
:Revision: $Revision$
11-
:URL: $URL$
12-
:Copyright: © 2005, 2007 Günter Milde.
13-
Released without warranty under the terms of the
14-
GNU General Public License (v. 2 or later)
8+
Literate programming with reStructuredText
159

1610
::
1711

@@ -24,22 +18,26 @@ Literate programming with reStructuredText
2418
Requirements for installation::
2519

2620
from setuptools import setup, find_packages
21+
import pathlib
2722

2823
Module Definition::
2924

3025
setup(
31-
name='PyLit',
26+
name='pylit',
3227
version='3.1.1',
3328
description='Python Literate Programming',
29+
long_description=pathlib.Path('README.rst').read_text(),
3430
author='S.Lott',
3531
author_email='slott56@gmail.com',
36-
python_requires=">=3.4",
32+
python_requires=">=3.5",
33+
url='https://github.com/slott56/PyLit-3',
3734
project_urls={
3835
"Documentation": 'https://slott56.github.io/PyLit-3/index.html',
3936
"Source Code": 'https://github.com/slott56/PyLit-3',
4037
"Bug Tracker": 'https://github.com/slott56/PyLit-3/issues',
4138
},
42-
py_modules=find_packages(),
39+
provides='pylit',
40+
py_modules=['pylit'],
4341
classifiers=[
4442
"Development Status :: 6 - Mature",
4543
"Intended Audience :: Developers",

0 commit comments

Comments
 (0)