Skip to content

Commit

Permalink
Remove nose as we're not using it for any of the tests anymore.
Browse files Browse the repository at this point in the history
  • Loading branch information
Coop56 committed Mar 21, 2019
1 parent fb00670 commit 7580766
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ install:
else
sudo apt-get -qq -y update;
sudo apt-get install -y libgdal1i python-gdal gdal-bin spatialite-bin;
sudo apt-get install -y python-virtualenv python-imaging python-lxml python-pyproj python-shapely python-nose python-httplib2 python-httplib2 gettext;
sudo apt-get install -y python-virtualenv python-imaging python-lxml python-pyproj python-shapely python-httplib2 python-httplib2 gettext;
sudo apt-get install -y python-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev libpq-dev libgdal-dev git default-jdk;
sudo apt-add-repository -y ppa:webupd8team/java; sudo apt update;
echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections;
Expand Down
1 change: 0 additions & 1 deletion dev_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ DATA_DIR_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/data-2.14
JETTY_RUNNER_URL: "http://repo2.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.7.v20170914/jetty-runner-9.4.7.v20170914.jar"
WINDOWS:
py2exe: "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"
nose: "https://s3.amazonaws.com/geonodedeps/nose-1.3.3.win32-py2.7.exe"
pyproj: "https://pyproj.googlecode.com/files/pyproj-1.9.3.win32-py2.7.exe"
lxml: "https://pypi.python.org/packages/2.7/l/lxml/lxml-3.6.0.win32-py2.7.exe"
11 changes: 0 additions & 11 deletions geonode/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -483,11 +483,6 @@
integration_bdd_tests = ast.literal_eval(os.environ.get('TEST_RUN_INTEGRATION_BDD', 'False'))
selenium_tests = ast.literal_eval(os.environ.get('TEST_RUN_SELENIUM', 'False'))

# Setting a custom test runner to avoid running the tests for
# some problematic 3rd party apps
# Default Nose Test Suite
# TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'

# Django 1.11 ParallelTestSuite
TEST_RUNNER = 'geonode.tests.suite.runner.GeoNodeBaseSuiteDiscoverRunner'
TEST_RUNNER_KEEPDB = 0
Expand All @@ -504,12 +499,6 @@
TEST = 'test' in sys.argv
INTEGRATION = 'geonode.tests.integration' in sys.argv

# Arguments for the test runner
NOSE_ARGS = [
'--nocapture',
'--detailed-errors',
]

#
# Customizations to built in Django settings required by GeoNode
#
Expand Down
2 changes: 1 addition & 1 deletion package/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Build-Depends: python-all-dev (>= 2.6.6-3), debhelper (>= 7.0.50~)

Package: geonode
Architecture: all
Depends: geoserver-geonode (= 2.14.0), apache2, libapache2-mod-wsgi, gdal-bin, libgeos-dev, gettext, postgresql-contrib, postgis, libpq-dev, zip, unzip, language-pack-en, libjpeg-dev, libpng-dev, libxslt1-dev, zlib1g-dev, libffi-dev, libssl-dev, python-setuptools (= 39.0.1-2), python-django, python-pip, python-celery, python-gdal, python-shapely (= 1.5.17-3), python-pyproj, libproj-dev, python-virtualenv, python-paver, python-elasticsearch (= 2.4.1-1), python-sqlalchemy, python-bs4, python-html5lib, python-webencodings, python-lxml, python-psycopg2, python-arcrest (= 10.3-1), python-dateutil, python-pil, python-nose, python-httplib2, python-shapely (= 1.5.17-3), python-paver, python-gsconfig (= 1.0.10-1), python-gn-gsimporter (= 1.0.9-2), python-owslib (= 0.16.0-1), python-pycsw (= 2.2.0-1), python-decorator, python-timeout-decorator (= 0.4.0-1), python-six (= 1.10.0-1), python-django-allauth, python-django-bootstrap-form (= 3.4-1), python-django-forms-bootstrap (= 3.1.0-2), python-django-activity-stream (= 0.6.5-2), python-django-autocomplete-light (= 2.3.3-2), python-django-filters, python-django-ipware (= 2.1.0-1), python-django-jsonfield (= 1.0.1-2), python-django-jsonfield-compat (= 0.4.4+geonode-1), python-django-leaflet (= 0.23.0-2), python-django-multi-email-field (= 0.5.1-2), python-django-taggit, python-django-treebeard, python-django-mptt, python-django-guardian, python-django-tastypie, python-dj-database-url (= 0.4.2-1), python-pinax-notifications (= 4.1.0+geonode-1), python-backports.functools-lru-cache, python-boto, python-constantly, python-django-geoexplorer (= 4.0.41-1), python-django-geoexplorer-worldmap (= 4.0.47-1), python-django-appconf, python-django-storages (= 1.6.5-2), python-django-floppyforms (= 1.7.0-2), python-django-invitations (= 1.9.2-2), python-django-bootstrap3-datetimepicker-2 (= 2.5.0+geonode-1), python-awesome-slugify (= 1.6.5+geonode-1), python-uwsgi (= 2.0.17-2), python-websocket-client (= 0.51.0-1), python-django-geonode-client, python-django-modeltranslation, python-geonode-user-messages (= 0.1.14-1), python-geonode-avatar (= 2.1.8-1), python-geonode-agon-ratings (= 0.3.8+geonode-1), python-geonode-dialogos (= 1.2-1), python-geonode-oauth-toolkit (= 1.1.2rc0-1), python-geonode-announcements (= 1.0.13+geonode-1), python-oauthlib (= 2.1.0-1), python-itypes, python-uritemplate, python-jinja2 (= 2.10-1), python-coreschema, python-inflection, python-pygments, python-openid, python-configparser, python-sqlalchemy, python-psutil, python-django-cors-headers, python-requests, python-django-downloadview, python-django-extra-views, python-django-polymorphic, python-django-basic-authentication-decorator (= 0.9-2), python-django-haystack, python-coverage, python-ply, python-pep8, python-poster, python-pyshp, python-simplejson, python-antlr, python-dicttoxml, python-datautil, python-enum34, python-geographiclib, python-geopy, python-glob2, python-gunicorn, python-hyperlink, python-simplegeneric, python-scandir, python-pyasn1, python-twisted-bin, python-pyasn1-modules, python-ipython-genutils, python-incremental, python-wcwidth, python-ptyprocess, python-zope.interface, python-serial, python-pathlib2, python-pam, python-traitlets, python-automat, python-service-identity, python-prompt-toolkit, python-pexpect, python-twisted-core, python-pickleshare, python-ipython, python-pycountry, python-lxml, python-jwcrypto, python-jdcal, python-maxminddb, python-parse-type, python-pillow, python-pluggy, python-hamcrest, python-openssl, python-pycodestyle, python-xmljson (= 0.1.9-2), python-user-agents (= 1.1.0-2), python-twisted, python-typing, python-py, python-tqdm, python-traitlets, python-mock, python-mako, python-invoke, python-memcached (= 1.59-2), python-yaml, python-dj-pagination (= 2.3.2-2), python-ua-parser (= 0.8.0-4), python-humanfriendly, ${misc:Depends}, ${python:Depends}
Depends: geoserver-geonode (= 2.14.0), apache2, libapache2-mod-wsgi, gdal-bin, libgeos-dev, gettext, postgresql-contrib, postgis, libpq-dev, zip, unzip, language-pack-en, libjpeg-dev, libpng-dev, libxslt1-dev, zlib1g-dev, libffi-dev, libssl-dev, python-setuptools (= 39.0.1-2), python-django, python-pip, python-celery, python-gdal, python-shapely (= 1.5.17-3), python-pyproj, libproj-dev, python-virtualenv, python-paver, python-elasticsearch (= 2.4.1-1), python-sqlalchemy, python-bs4, python-html5lib, python-webencodings, python-lxml, python-psycopg2, python-arcrest (= 10.3-1), python-dateutil, python-pil, python-httplib2, python-shapely (= 1.5.17-3), python-paver, python-gsconfig (= 1.0.10-1), python-gn-gsimporter (= 1.0.9-2), python-owslib (= 0.16.0-1), python-pycsw (= 2.2.0-1), python-decorator, python-timeout-decorator (= 0.4.0-1), python-six (= 1.10.0-1), python-django-allauth, python-django-bootstrap-form (= 3.4-1), python-django-forms-bootstrap (= 3.1.0-2), python-django-activity-stream (= 0.6.5-2), python-django-autocomplete-light (= 2.3.3-2), python-django-filters, python-django-ipware (= 2.1.0-1), python-django-jsonfield (= 1.0.1-2), python-django-jsonfield-compat (= 0.4.4+geonode-1), python-django-leaflet (= 0.23.0-2), python-django-multi-email-field (= 0.5.1-2), python-django-taggit, python-django-treebeard, python-django-mptt, python-django-guardian, python-django-tastypie, python-dj-database-url (= 0.4.2-1), python-pinax-notifications (= 4.1.0+geonode-1), python-backports.functools-lru-cache, python-boto, python-constantly, python-django-geoexplorer (= 4.0.41-1), python-django-geoexplorer-worldmap (= 4.0.47-1), python-django-appconf, python-django-storages (= 1.6.5-2), python-django-floppyforms (= 1.7.0-2), python-django-invitations (= 1.9.2-2), python-django-bootstrap3-datetimepicker-2 (= 2.5.0+geonode-1), python-awesome-slugify (= 1.6.5+geonode-1), python-uwsgi (= 2.0.17-2), python-websocket-client (= 0.51.0-1), python-django-geonode-client, python-django-modeltranslation, python-geonode-user-messages (= 0.1.14-1), python-geonode-avatar (= 2.1.8-1), python-geonode-agon-ratings (= 0.3.8+geonode-1), python-geonode-dialogos (= 1.2-1), python-geonode-oauth-toolkit (= 1.1.2rc0-1), python-geonode-announcements (= 1.0.13+geonode-1), python-oauthlib (= 2.1.0-1), python-itypes, python-uritemplate, python-jinja2 (= 2.10-1), python-coreschema, python-inflection, python-pygments, python-openid, python-configparser, python-sqlalchemy, python-psutil, python-django-cors-headers, python-requests, python-django-downloadview, python-django-extra-views, python-django-polymorphic, python-django-basic-authentication-decorator (= 0.9-2), python-django-haystack, python-coverage, python-ply, python-pep8, python-poster, python-pyshp, python-simplejson, python-antlr, python-dicttoxml, python-datautil, python-enum34, python-geographiclib, python-geopy, python-glob2, python-gunicorn, python-hyperlink, python-simplegeneric, python-scandir, python-pyasn1, python-twisted-bin, python-pyasn1-modules, python-ipython-genutils, python-incremental, python-wcwidth, python-ptyprocess, python-zope.interface, python-serial, python-pathlib2, python-pam, python-traitlets, python-automat, python-service-identity, python-prompt-toolkit, python-pexpect, python-twisted-core, python-pickleshare, python-ipython, python-pycountry, python-lxml, python-jwcrypto, python-jdcal, python-maxminddb, python-parse-type, python-pillow, python-pluggy, python-hamcrest, python-openssl, python-pycodestyle, python-xmljson (= 0.1.9-2), python-user-agents (= 1.1.0-2), python-twisted, python-typing, python-py, python-tqdm, python-traitlets, python-mock, python-mako, python-invoke, python-memcached (= 1.59-2), python-yaml, python-dj-pagination (= 2.3.2-2), python-ua-parser (= 0.8.0-4), python-humanfriendly, ${misc:Depends}, ${python:Depends}
Recommends: python-gisdata
Description: Allows the creation, sharing, and collaborative use of geospatial data.
At its core, the GeoNode has a stack based on GeoServer, pycsw,
Expand Down
5 changes: 2 additions & 3 deletions pavement.py
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ def win_install_deps(options):
win_packages = {
# required by transifex-client
"Py2exe": dev_config['WINDOWS']['py2exe'],
"Nose": dev_config['WINDOWS']['nose'],
# the wheel 1.9.4 installs but pycsw wants 1.9.3, which fails to compile
# when pycsw bumps their pyproj to 1.9.4 this can be removed.
"PyProj": dev_config['WINDOWS']['pyproj'],
Expand All @@ -361,9 +360,9 @@ def win_install_deps(options):
os.remove(tempfile)
if failed and sys.maxsize > 2**32:
print "64bit architecture is not currently supported"
print "try finding the 64 binaries for py2exe, nose, and pyproj"
print "try finding the 64 binaries for py2exe, and pyproj"
elif failed:
print "install failed for py2exe, nose, and/or pyproj"
print "install failed for py2exe, and/or pyproj"
else:
print "Windows dependencies now complete. Run pip install -e geonode --use-mirrors"

Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ pyyaml>=4.2b1
beautifulsoup4==4.7.1
httplib2<=0.10.3
Paver==1.3.4
nose<=1.3.7
awesome-slugify<=1.6.5
django-floppyforms<=1.7.0
decorator==4.3.2
Expand Down
1 change: 0 additions & 1 deletion requirements_docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ kombu==4.4.0
lxml==3.6.2
mercantile==1.0.4
mock==2.0.0
nose==1.3.7
oauthlib==2.1.0
OWSLib==0.16.0
Paver==1.3.4
Expand Down

0 comments on commit 7580766

Please sign in to comment.