Skip to content

Commit

Permalink
Rename lots of other stuff from Aspen to Pando
Browse files Browse the repository at this point in the history
  • Loading branch information
chadwhitacre committed Mar 19, 2016
1 parent a446b9a commit 2c0f128
Show file tree
Hide file tree
Showing 29 changed files with 125 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*.egg-info/
aspen/tests/log
pando/tests/log
env
*.pyc
distribute-*
Expand Down
4 changes: 2 additions & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Aspen.py Changelog
==================
Pando Changelog
===============

0.42 - Released Thu Sept 10 2015 by @whit537
--------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include COPYRIGHT
include ez_setup.py
include version.txt
include aspen/configuration/mime.types
graft aspen/www
include pando/configuration/mime.types
graft pando/www
20 changes: 10 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
Aspen is a Python web framework. Simplates are the main attraction.
Pando is a Python web framework. Simplates are the main attraction.

Installation, Testing, and License
==================================

``aspen`` is available on `GitHub`_ and on `PyPI`_::
``pando`` is available on `GitHub`_ and on `PyPI`_::

$ pip install aspen
$ pip install pando

We test against 64-bit Python 2.7 on Linux: |travis|

And we test against 32- and 64-bit Python 2.7 on Windows: |appveyor|

``aspen`` is MIT-licensed.
``pando`` is MIT-licensed.


.. _GitHub: https://github.com/AspenWeb/aspen.py
.. _PyPI: https://pypi.python.org/pypi/aspen
.. |travis| image:: https://img.shields.io/travis/AspenWeb/aspen.py/master.svg
:target: https://travis-ci.org/AspenWeb/aspen.py
.. _GitHub: https://github.com/AspenWeb/pando.py
.. _PyPI: https://pypi.python.org/pypi/pando
.. |travis| image:: https://img.shields.io/travis/AspenWeb/pando.py/master.svg
:target: https://travis-ci.org/AspenWeb/pando.py
:alt: Linux build status
.. |appveyor| image:: https://img.shields.io/appveyor/ci/AspenWeb/aspen-py/master.svg
:target: https://ci.appveyor.com/project/AspenWeb/aspen-py
.. |appveyor| image:: https://img.shields.io/appveyor/ci/AspenWeb/pando-py/master.svg
:target: https://ci.appveyor.com/project/AspenWeb/pando-py
:alt: Windows build status


Expand Down
3 changes: 0 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ build: false # Not a C# project, build stuff at the test step instead.

test_script:

# extra debug for the dispatcher (at least)
#- "SET ASPEN_DEBUG=1"

# Build the compiled extension and run the project tests
- "python build.py analyse"

Expand Down
8 changes: 4 additions & 4 deletions aspen_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"""
import os
import os.path
from aspen.configuration import parse
from aspen.website import Website
from pando.configuration import parse
from pando.website import Website

distribution_root = os.path.dirname(__file__)
website = Website( www_root=os.path.join(distribution_root, 'doc')
Expand Down Expand Up @@ -57,7 +57,7 @@ def screenshot(short, imgtype='png', href=''):
).decode('US-ASCII'))
opts['base'] = ''

# this is a dirty nasty hack. We should store the version in the aspen module somewhere
# this is a dirty nasty hack. We should store the version in the pando module somewhere
opts['version'] = open(os.path.join(website.www_root,'..','version.txt')).read()[:-len('-dev')]

# no idea why this doesn't work
Expand All @@ -68,5 +68,5 @@ def screenshot(short, imgtype='png', href=''):


if __name__ == '__main__':
from aspen import serve
from pando import serve
serve(website)
16 changes: 8 additions & 8 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Core Executables
# ================

ASPEN_DEPS = [
PANDO_DEPS = [
'python-mimeparse>=0.1.4',
'first>=2.0.1',
'algorithm>=1.0.0',
Expand All @@ -26,7 +26,7 @@

ENV_ARGS = [
'-m', 'virtualenv',
'--prompt=[aspen]',
'--prompt=[pando]',
]


Expand Down Expand Up @@ -68,16 +68,16 @@ def env():


def deps():
"""set up an environment able to run aspen"""
"""set up an environment able to run pando"""
_deps()


def _deps(envdir='env'):
envdir = _env(envdir)
v = shell(_virt('python', envdir), '-c', 'import aspen; print("found")', ignore_status=True)
v = shell(_virt('python', envdir), '-c', 'import pando; print("found")', ignore_status=True)
if b"found" in v:
return envdir
for dep in ASPEN_DEPS:
for dep in PANDO_DEPS:
run(_virt('pip', envdir), 'install', dep)
run(_virt('python', envdir), 'setup.py', 'develop')
return envdir
Expand Down Expand Up @@ -167,7 +167,7 @@ def pylint():
envdir = _env()
run(_virt('pip', envdir), 'install', 'pylint')
run(_virt('pylint', envdir), '--rcfile=.pylintrc',
'aspen', '|', 'tee', 'pylint.out', shell=True, ignore_status=True)
'pando', '|', 'tee', 'pylint.out', shell=True, ignore_status=True)


def test_cov():
Expand All @@ -177,7 +177,7 @@ def test_cov():
'--cov-report', 'term',
'--cov-report', 'xml',
'--cov-report', 'html',
'--cov', 'aspen',
'--cov', 'pando',
'tests/',
ignore_status=False)

Expand Down Expand Up @@ -245,7 +245,7 @@ def jython_test():
'--junitxml=jython-testresults.xml', 'tests',
'--cov-report', 'term',
'--cov-report', 'xml',
'--cov', 'aspen',
'--cov', 'pando',
ignore_status=True)

def clean_jtest():
Expand Down
14 changes: 7 additions & 7 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Aspen documentation build configuration file, created by
# Pando documentation build configuration file, created by
# sphinx-quickstart on Mon Feb 24 15:00:43 2014.
#
# This file is execfile()d with the current directory set to its containing dir.
Expand Down Expand Up @@ -40,7 +40,7 @@
master_doc = 'index'

# General information about the project.
project = u'Aspen'
project = u'Pando'
copyright = u'2014, Chad Whitacre, Paul Jimenez, and others'

# The version info for the project you're documenting, acts as replacement for
Expand Down Expand Up @@ -164,7 +164,7 @@
#html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = 'Aspendoc'
htmlhelp_basename = 'Pandodoc'


# -- Options for LaTeX output --------------------------------------------------
Expand All @@ -183,7 +183,7 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'Aspen.tex', u'Aspen Documentation',
('index', 'Pando.tex', u'Pando Documentation',
u'Chad Whitacre, Paul Jimenez, and others', 'manual'),
]

Expand Down Expand Up @@ -213,7 +213,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'aspen', u'Aspen Documentation',
('index', 'pando', u'Pando Documentation',
[u'Chad Whitacre, Paul Jimenez, and others'], 1)
]

Expand All @@ -227,8 +227,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'Aspen', u'Aspen Documentation',
u'Chad Whitacre, Paul Jimenez, and others', 'Aspen', 'One line description of project.',
('index', 'Pando', u'Pando Documentation',
u'Chad Whitacre, Paul Jimenez, and others', 'Pando', 'One line description of project.',
'Miscellaneous'),
]

Expand Down
Loading

0 comments on commit 2c0f128

Please sign in to comment.