Commit 4b507353 authored by Jay's avatar Jay
Browse files

Updates for env

parent 9a6dee02

autocnet/graph/network.py

+7 −2
Original line number Diff line number Diff line
@@ -1579,13 +1579,17 @@ class NetworkCandidateGraph(CandidateGraph): 
                         that manage asynchronous database inserts. This is primarily

                         used for increased write performance.

        """

        

        self.config = config_dict

        

        self.async_watchers = async_watchers

        print('Watchers setup')

        # Setup REDIS

        self._setup_queues()



        print('Queues setup')

        # Setup the database

        self._setup_database()

        print('Database setup')



        # Setup threaded queue watchers

        if self.async_watchers == True:
@@ -1637,6 +1641,7 @@ class NetworkCandidateGraph(CandidateGraph): 
        sleeptime = 2

        retries = 0

        while retries < 5:

            print(f'Database connection attempt {retries}')

            try:

                self.Session, self.engine = new_connection(self.config['database'])

environment.yml

+8 −12
Original line number Diff line number Diff line 
name: root

prefix: /opt/conda

channels:

  - conda-forge

  - usgs-astrogeology

  - menpo



dependencies:

  - python>=3
@@ -24,10 +20,9 @@ dependencies: 
  - ipykernel

  - jupyter

  - kalasiris

  - knoten=0.2.0

  - conda-forge::knoten

  - ncurses

  - networkx=2

  - numexpr

  - networkx>=2,<3

  - numpy

  - opencv <= 3.5

  - pillow
@@ -36,6 +31,7 @@ dependencies: 
  - pyyaml

  - plurmy

  - psycopg2

  - pvl>=1.0,<2

  - proj=7.0.0

  - pvl = 1.0

  - pyproj
@@ -44,14 +40,14 @@ dependencies: 
  - pytest-mock

  - runipy

  - richdem

  - scikit-image=0.17

  - scikit-image>=0.17

  - scikit-learn

  - scipy=1.2.1

  - shapely

  - sqlalchemy=1.4

  - sqlalchemy-utils=0.37.0

  - sqlalchemy

  - sqlalchemy-utils

  - redis-py

  - usgscsm

  - conda-forge::usgscsm>=1.6.0

  - vlfeat

  - pip

  - protobuf

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from setuptools import setup, find_packages 
with open('README.md', 'r') as f:

    long_description = f.read()



__version__ = '1.0.0-rc2'

__version__ = '1.0.0'



def setup_package():

    setup(