Skip to content

Commit

Permalink
x
Browse files Browse the repository at this point in the history
  • Loading branch information
thespacedoctor committed Jul 7, 2023
1 parent 75b64d7 commit 2987266
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ formats: all
python:
version: 3.8
install:
- method: setuptools
path: .
- requirements: docs/requirements.txt

submodules:
Expand Down
4 changes: 2 additions & 2 deletions dryxPyramid/templates/responses/templates_login.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from builtins import object
import sys
import os
import khufu


class templates_login(object):
"""
Expand Down Expand Up @@ -70,7 +70,7 @@ def get(self):
- ``loginPage`` -- the login page
"""
self.log.debug('starting the ``get`` method')

import khufu
loginPage = khufu.scaffolding.login_page(
log=self.log,
mainCssFilePath=self.mainCssFilePath,
Expand Down
11 changes: 4 additions & 7 deletions dryxPyramid/utKit.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@
import shutil
import unittest
import yaml
from pyramid import testing
from pyramid.path import AssetResolver
from pyramid.request import apply_request_extensions
from paste.deploy.loadwsgi import appconfig
import pymysql as ms
from sqlalchemy import engine_from_config
from sqlalchemy.orm import sessionmaker
from fundamentals import utKit

# OVERRIDES
Expand Down Expand Up @@ -131,12 +124,15 @@ def cleanup(request):

class BaseTest(unittest.TestCase):

from pyramid import testing

def __init__(self, *args, **kwargs):
unittest.TestCase.__init__(self, *args, **kwargs)

def setUp(self):
'''This is the default setup method for pyramid unit tests. It will instantiate a database connection to the unit_tesing database on localhost
'''
from paste.deploy.loadwsgi import appconfig
moduleDirectory = os.path.dirname(__file__)
app_settings = appconfig(
'config:' + self.testIni)
Expand All @@ -148,4 +144,5 @@ def setUp(self):
'/login', params={'login': self.settings["test user"], 'password': self.settings["test pass"]})

def tearDown(self):

testing.tearDown()
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@ def readme():
'sqlalchemy==1.4.48',
'passlib',
'paste',
'fundamentals',
'pymysql',
'khufu',
'numpy'
'khufu'
]

# READ THE DOCS SERVERS
exists = os.path.exists("/home/docs/")
if exists:
install_requires = ['fundamentals', 'setuptools==62.4.0', 'pyramid']
install_requires = ['fundamentals', 'pyramid']

setup(name="dryxPyramid",
version=__version__,
Expand Down

0 comments on commit 2987266

Please sign in to comment.