Improved distribution system for conda-forge and pip#440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jpn-- wants to merge 15 commits into from
Closed

Improved distribution system for conda-forge and pip #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
91f4583
excise orca
jpn-- Jun 21, 2021
d0835e4
excise zbox
jpn-- Jun 21, 2021
a450030
travis to use conda
jpn-- Jun 21, 2021
575b31a
see if mamba will work better
jpn-- Jun 21, 2021
a2142a4
openmatrix in cf
jpn-- Jun 21, 2021
9539728
epic battle against travis continues
jpn-- Jun 21, 2021
298c5a4
more small errors on travis script
jpn-- Jun 21, 2021
0dd64d0
fix template for pandas 1.3
jpn-- Jul 8, 2021
252b741
don't make PerformanceWarnings into errors
jpn-- Jul 8, 2021
23fa7d6
getting started
jpn-- Jul 8, 2021
ced5d84
for pycodestyle
jpn-- Jul 8, 2021
693a6bb
alt install instructions
jpn-- Jul 8, 2021
93604cf
fix larch+asim for pandas 1.3
jpn-- Jul 9, 2021
7f33001
pycodestyle
jpn-- Jul 9, 2021
74b1fcc
add a bit more wiggle to larch regression tolerance
jpn-- Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,15 @@ env:
global:
# GH_TOKEN ActivitySim/activitysim public_repo token
- secure: WZeCAmI08hBRgtVWUlerfizvSpOVlBxQDa/Z6HJiDUlIXdSAOIi7TAwnluOgs3lHbSqACegbLCU9CyIQa/ytwmmuwzltkSQN14EcnKea0bXyygd8DFdx4x8st8M3a4nh2svgp4BDM9PCu6T1XIZ1rYM46JsKzNk9X8GpWOVN498=
- TEST_ENV=activitysim-test
jobs:
# Add new TEST_SUITE jobs as needed via Travis build matrix expansion
# define an alternative TEST_ENV to add special dependencies for particular tests
- TEST_SUITE=activitysim/abm/models
- TEST_SUITE=activitysim/abm/test
- TEST_SUITE=activitysim/cli
- TEST_SUITE=activitysim/core
- TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_DEPENDS="larch>=5.5.3 -c conda-forge"
- TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_ENV="activitysim-test-larch"
- TEST_SUITE=activitysim/examples/example_mtc/test
- TEST_SUITE=activitysim/examples/example_multiple_zone/test
- TEST_SUITE=activitysim/examples/example_marin/test
Expand All@@ -25,26 +27,27 @@ python:
- '3.8'

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- wget -O Mambaforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
- bash Mambaforge.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- conda activate test-environment
- conda install pytest pytest-cov coveralls pycodestyle $TEST_DEPENDS
- pip install pytest-regressions
- mamba update -q mamba
- mamba info -a
# write travis python version into selected test environment definition file
- sed -e "s/\${TRAVIS_PYTHON_VERSION}/${TRAVIS_PYTHON_VERSION}/" conda-environments/${TEST_ENV}.yml > conda-env.yml
# create test environment in one pass
- mamba env create -n asimtest --file conda-env.yml
- conda activate asimtest
- pip install .
- pip freeze

script:
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
Expand All@@ -53,7 +56,7 @@ script:
after_success:
- coveralls
# Build docs
- pip install sphinx numpydoc sphinx_rtd_theme
- mamba install sphinx numpydoc sphinx_rtd_theme
- cd docs
- make clean
- make html
Expand Down
1 change: 0 additions & 1 deletion activitysim/abm/models/util/cdap.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@

import numpy as np
import pandas as pd
from zbox import toolz as tz, gen

from activitysim.core import simulate
from activitysim.core import pipeline
Expand Down
6 changes: 6 additions & 0 deletions activitysim/core/config.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -553,6 +553,12 @@ def filter_warnings():
warnings.filterwarnings('ignore', category=DeprecationWarning, module='tables',
message='`np.object` is a deprecated alias')

# beginning pandas version 1.3, various places emit a PerformanceWarning that is
# caught in the "strict" filter above, but which are currently unavoidable for complex models.
# These warning are left as warnings as an invitation for future enhancement.
from pandas.errors import PerformanceWarning
warnings.filterwarnings('default', category=PerformanceWarning)


def handle_standard_args(parser=None):

Expand Down
21 changes: 7 additions & 14 deletions activitysim/core/inject.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,7 @@
# See full license in LICENSE.txt.
import logging

try:
# use orca module if installed
import orca
import orca.orca as _ORCA
except ModuleNotFoundError:
# otherwise use local copy
from . import orca
from . import orca as _ORCA
from orca import orca

_DECORATED_STEPS = {}
_DECORATED_TABLES = {}
Expand DownExpand Up@@ -135,7 +128,7 @@ def get_injectable(name, default=_NO_DEFAULT):

def remove_injectable(name):

_ORCA._INJECTABLES.pop(name, None)
orca._INJECTABLES.pop(name, None)


def reinject_decorated_tables():
Expand All@@ -146,10 +139,10 @@ def reinject_decorated_tables():
logger.info("reinject_decorated_tables")

# need to clear any non-decorated tables that were added during the previous run
_ORCA._TABLES.clear()
_ORCA._COLUMNS.clear()
_ORCA._TABLE_CACHE.clear()
_ORCA._COLUMN_CACHE.clear()
orca._TABLES.clear()
orca._COLUMNS.clear()
orca._TABLE_CACHE.clear()
orca._COLUMN_CACHE.clear()

for name, func in _DECORATED_TABLES.items():
logger.debug("reinject decorated table %s" % name)
Expand DownExpand Up@@ -189,4 +182,4 @@ def get_step_arg(arg_name, default=_NO_DEFAULT):
def dump_state():

print("_DECORATED_STEPS", list(_DECORATED_STEPS.keys()))
print("_ORCA._STEPS", list(_ORCA._STEPS.keys()))
print("orca._STEPS", list(orca._STEPS.keys()))
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Improved distribution system for conda-forge and pip#440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jpn--
wants to merge
15
commits into

from

 Closed


Improved distribution system for conda-forge and pip
#440
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
91f4583

excise orca


jpn-- Jun 21, 2021
d0835e4

excise zbox


jpn-- Jun 21, 2021
a450030

travis to use conda


jpn-- Jun 21, 2021
575b31a

see if mamba will work better


jpn-- Jun 21, 2021
a2142a4

openmatrix in cf


jpn-- Jun 21, 2021
9539728

epic battle against travis continues


jpn-- Jun 21, 2021
298c5a4

more small errors on travis script


jpn-- Jun 21, 2021
0dd64d0

fix template for pandas 1.3


jpn-- Jul 8, 2021
252b741

don't make PerformanceWarnings into errors


jpn-- Jul 8, 2021
23fa7d6

getting started


jpn-- Jul 8, 2021
ced5d84

for pycodestyle


jpn-- Jul 8, 2021
693a6bb

alt install instructions


jpn-- Jul 8, 2021
93604cf

fix larch+asim for pandas 1.3


jpn-- Jul 9, 2021
7f33001

pycodestyle


jpn-- Jul 9, 2021
74b1fcc

add a bit more wiggle to larch regression tolerance


jpn-- Jul 9, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 15 additions & 12 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,15 @@ env:
 global:
 # GH_TOKEN ActivitySim/activitysim public_repo token
 - secure: WZeCAmI08hBRgtVWUlerfizvSpOVlBxQDa/Z6HJiDUlIXdSAOIi7TAwnluOgs3lHbSqACegbLCU9CyIQa/ytwmmuwzltkSQN14EcnKea0bXyygd8DFdx4x8st8M3a4nh2svgp4BDM9PCu6T1XIZ1rYM46JsKzNk9X8GpWOVN498=
 - TEST_ENV=activitysim-test
 jobs:
 # Add new TEST_SUITE jobs as needed via Travis build matrix expansion
 # define an alternative TEST_ENV to add special dependencies for particular tests
 - TEST_SUITE=activitysim/abm/models
 - TEST_SUITE=activitysim/abm/test
 - TEST_SUITE=activitysim/cli
 - TEST_SUITE=activitysim/core
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_DEPENDS="larch>=5.5.3 -c conda-forge"
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_ENV="activitysim-test-larch"
 - TEST_SUITE=activitysim/examples/example_mtc/test
 - TEST_SUITE=activitysim/examples/example_multiple_zone/test
 - TEST_SUITE=activitysim/examples/example_marin/test
Expand All@@ -25,26 +27,27 @@ python:
 - '3.8'

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- wget -O Mambaforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
- bash Mambaforge.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- conda activate test-environment
- conda install pytest pytest-cov coveralls pycodestyle $TEST_DEPENDS
- pip install pytest-regressions
- mamba update -q mamba
- mamba info -a
# write travis python version into selected test environment definition file
- sed -e "s/\${TRAVIS_PYTHON_VERSION}/${TRAVIS_PYTHON_VERSION}/" conda-environments/${TEST_ENV}.yml > conda-env.yml
# create test environment in one pass
- mamba env create -n asimtest --file conda-env.yml
- conda activate asimtest
- pip install .
- pip freeze

script:
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
Expand All@@ -53,7 +56,7 @@ script:
after_success:
- coveralls
# Build docs
- pip install sphinx numpydoc sphinx_rtd_theme
- mamba install sphinx numpydoc sphinx_rtd_theme
- cd docs
- make clean
- make html
Expand Down

1 change: 0 additions & 1 deletion
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@

import numpy as np
import pandas as pd
from zbox import toolz as tz, gen

from activitysim.core import simulate
from activitysim.core import pipeline
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -553,6 +553,12 @@ def filter_warnings():
 warnings.filterwarnings('ignore', category=DeprecationWarning, module='tables',
 message='`np.object` is a deprecated alias')

 # beginning pandas version 1.3, various places emit a PerformanceWarning that is
 # caught in the "strict" filter above, but which are currently unavoidable for complex models.
 # These warning are left as warnings as an invitation for future enhancement.
 from pandas.errors import PerformanceWarning
 warnings.filterwarnings('default', category=PerformanceWarning)


def handle_standard_args(parser=None):

Expand Down

21 changes: 7 additions & 14 deletions
activitysim/core/inject.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,7 @@
# See full license in LICENSE.txt.
import logging

try:
 # use orca module if installed
 import orca
 import orca.orca as _ORCA
except ModuleNotFoundError:
 # otherwise use local copy
 from . import orca
 from . import orca as _ORCA
from orca import orca

_DECORATED_STEPS = {}
_DECORATED_TABLES = {}
Expand DownExpand Up@@ -135,7 +128,7 @@ def get_injectable(name, default=_NO_DEFAULT):

def remove_injectable(name):

_ORCA._INJECTABLES.pop(name, None)
orca._INJECTABLES.pop(name, None)


def reinject_decorated_tables():
Expand All@@ -146,10 +139,10 @@ def reinject_decorated_tables():
 logger.info("reinject_decorated_tables")

 # need to clear any non-decorated tables that were added during the previous run
_ORCA._TABLES.clear()
_ORCA._COLUMNS.clear()
_ORCA._TABLE_CACHE.clear()
_ORCA._COLUMN_CACHE.clear()
orca._TABLES.clear()
orca._COLUMNS.clear()
orca._TABLE_CACHE.clear()
orca._COLUMN_CACHE.clear()

 for name, func in _DECORATED_TABLES.items():
 logger.debug("reinject decorated table %s" % name)
Expand DownExpand Up@@ -189,4 +182,4 @@ def get_step_arg(arg_name, default=_NO_DEFAULT):
def dump_state():

 print("_DECORATED_STEPS", list(_DECORATED_STEPS.keys()))
 print("_ORCA._STEPS", list(_ORCA._STEPS.keys()))
 print("orca._STEPS", list(orca._STEPS.keys()))
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Improved distribution system for conda-forge and pip#440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jpn--
wants to merge
15
commits into

from

 Closed


Improved distribution system for conda-forge and pip
#440
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
91f4583

excise orca


jpn-- Jun 21, 2021
d0835e4

excise zbox


jpn-- Jun 21, 2021
a450030

travis to use conda


jpn-- Jun 21, 2021
575b31a

see if mamba will work better


jpn-- Jun 21, 2021
a2142a4

openmatrix in cf


jpn-- Jun 21, 2021
9539728

epic battle against travis continues


jpn-- Jun 21, 2021
298c5a4

more small errors on travis script


jpn-- Jun 21, 2021
0dd64d0

fix template for pandas 1.3


jpn-- Jul 8, 2021
252b741

don't make PerformanceWarnings into errors


jpn-- Jul 8, 2021
23fa7d6

getting started


jpn-- Jul 8, 2021
ced5d84

for pycodestyle


jpn-- Jul 8, 2021
693a6bb

alt install instructions


jpn-- Jul 8, 2021
93604cf

fix larch+asim for pandas 1.3


jpn-- Jul 9, 2021
7f33001

pycodestyle


jpn-- Jul 9, 2021
74b1fcc

add a bit more wiggle to larch regression tolerance


jpn-- Jul 9, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 15 additions & 12 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,15 @@ env:
 global:
 # GH_TOKEN ActivitySim/activitysim public_repo token
 - secure: WZeCAmI08hBRgtVWUlerfizvSpOVlBxQDa/Z6HJiDUlIXdSAOIi7TAwnluOgs3lHbSqACegbLCU9CyIQa/ytwmmuwzltkSQN14EcnKea0bXyygd8DFdx4x8st8M3a4nh2svgp4BDM9PCu6T1XIZ1rYM46JsKzNk9X8GpWOVN498=
 - TEST_ENV=activitysim-test
 jobs:
 # Add new TEST_SUITE jobs as needed via Travis build matrix expansion
 # define an alternative TEST_ENV to add special dependencies for particular tests
 - TEST_SUITE=activitysim/abm/models
 - TEST_SUITE=activitysim/abm/test
 - TEST_SUITE=activitysim/cli
 - TEST_SUITE=activitysim/core
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_DEPENDS="larch>=5.5.3 -c conda-forge"
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_ENV="activitysim-test-larch"
 - TEST_SUITE=activitysim/examples/example_mtc/test
 - TEST_SUITE=activitysim/examples/example_multiple_zone/test
 - TEST_SUITE=activitysim/examples/example_marin/test
Expand All@@ -25,26 +27,27 @@ python:
 - '3.8'

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- wget -O Mambaforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
- bash Mambaforge.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- conda activate test-environment
- conda install pytest pytest-cov coveralls pycodestyle $TEST_DEPENDS
- pip install pytest-regressions
- mamba update -q mamba
- mamba info -a
# write travis python version into selected test environment definition file
- sed -e "s/\${TRAVIS_PYTHON_VERSION}/${TRAVIS_PYTHON_VERSION}/" conda-environments/${TEST_ENV}.yml > conda-env.yml
# create test environment in one pass
- mamba env create -n asimtest --file conda-env.yml
- conda activate asimtest
- pip install .
- pip freeze

script:
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
Expand All@@ -53,7 +56,7 @@ script:
after_success:
- coveralls
# Build docs
- pip install sphinx numpydoc sphinx_rtd_theme
- mamba install sphinx numpydoc sphinx_rtd_theme
- cd docs
- make clean
- make html
Expand Down

1 change: 0 additions & 1 deletion
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@

import numpy as np
import pandas as pd
from zbox import toolz as tz, gen

from activitysim.core import simulate
from activitysim.core import pipeline
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -553,6 +553,12 @@ def filter_warnings():
 warnings.filterwarnings('ignore', category=DeprecationWarning, module='tables',
 message='`np.object` is a deprecated alias')

 # beginning pandas version 1.3, various places emit a PerformanceWarning that is
 # caught in the "strict" filter above, but which are currently unavoidable for complex models.
 # These warning are left as warnings as an invitation for future enhancement.
 from pandas.errors import PerformanceWarning
 warnings.filterwarnings('default', category=PerformanceWarning)


def handle_standard_args(parser=None):

Expand Down

21 changes: 7 additions & 14 deletions
activitysim/core/inject.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,7 @@
# See full license in LICENSE.txt.
import logging

try:
 # use orca module if installed
 import orca
 import orca.orca as _ORCA
except ModuleNotFoundError:
 # otherwise use local copy
 from . import orca
 from . import orca as _ORCA
from orca import orca

_DECORATED_STEPS = {}
_DECORATED_TABLES = {}
Expand DownExpand Up@@ -135,7 +128,7 @@ def get_injectable(name, default=_NO_DEFAULT):

def remove_injectable(name):

_ORCA._INJECTABLES.pop(name, None)
orca._INJECTABLES.pop(name, None)


def reinject_decorated_tables():
Expand All@@ -146,10 +139,10 @@ def reinject_decorated_tables():
 logger.info("reinject_decorated_tables")

 # need to clear any non-decorated tables that were added during the previous run
_ORCA._TABLES.clear()
_ORCA._COLUMNS.clear()
_ORCA._TABLE_CACHE.clear()
_ORCA._COLUMN_CACHE.clear()
orca._TABLES.clear()
orca._COLUMNS.clear()
orca._TABLE_CACHE.clear()
orca._COLUMN_CACHE.clear()

 for name, func in _DECORATED_TABLES.items():
 logger.debug("reinject decorated table %s" % name)
Expand DownExpand Up@@ -189,4 +182,4 @@ def get_step_arg(arg_name, default=_NO_DEFAULT):
def dump_state():

 print("_DECORATED_STEPS", list(_DECORATED_STEPS.keys()))
 print("_ORCA._STEPS", list(_ORCA._STEPS.keys()))
 print("orca._STEPS", list(orca._STEPS.keys()))
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Improved distribution system for conda-forge and pip#440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jpn--
wants to merge
15
commits into

from

 Closed


Improved distribution system for conda-forge and pip
#440
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
91f4583

excise orca


jpn-- Jun 21, 2021
d0835e4

excise zbox


jpn-- Jun 21, 2021
a450030

travis to use conda


jpn-- Jun 21, 2021
575b31a

see if mamba will work better


jpn-- Jun 21, 2021
a2142a4

openmatrix in cf


jpn-- Jun 21, 2021
9539728

epic battle against travis continues


jpn-- Jun 21, 2021
298c5a4

more small errors on travis script


jpn-- Jun 21, 2021
0dd64d0

fix template for pandas 1.3


jpn-- Jul 8, 2021
252b741

don't make PerformanceWarnings into errors


jpn-- Jul 8, 2021
23fa7d6

getting started


jpn-- Jul 8, 2021
ced5d84

for pycodestyle


jpn-- Jul 8, 2021
693a6bb

alt install instructions


jpn-- Jul 8, 2021
93604cf

fix larch+asim for pandas 1.3


jpn-- Jul 9, 2021
7f33001

pycodestyle


jpn-- Jul 9, 2021
74b1fcc

add a bit more wiggle to larch regression tolerance


jpn-- Jul 9, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 15 additions & 12 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,15 @@ env:
 global:
 # GH_TOKEN ActivitySim/activitysim public_repo token
 - secure: WZeCAmI08hBRgtVWUlerfizvSpOVlBxQDa/Z6HJiDUlIXdSAOIi7TAwnluOgs3lHbSqACegbLCU9CyIQa/ytwmmuwzltkSQN14EcnKea0bXyygd8DFdx4x8st8M3a4nh2svgp4BDM9PCu6T1XIZ1rYM46JsKzNk9X8GpWOVN498=
 - TEST_ENV=activitysim-test
 jobs:
 # Add new TEST_SUITE jobs as needed via Travis build matrix expansion
 # define an alternative TEST_ENV to add special dependencies for particular tests
 - TEST_SUITE=activitysim/abm/models
 - TEST_SUITE=activitysim/abm/test
 - TEST_SUITE=activitysim/cli
 - TEST_SUITE=activitysim/core
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_DEPENDS="larch>=5.5.3 -c conda-forge"
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_ENV="activitysim-test-larch"
 - TEST_SUITE=activitysim/examples/example_mtc/test
 - TEST_SUITE=activitysim/examples/example_multiple_zone/test
 - TEST_SUITE=activitysim/examples/example_marin/test
Expand All@@ -25,26 +27,27 @@ python:
 - '3.8'

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- wget -O Mambaforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
- bash Mambaforge.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- conda activate test-environment
- conda install pytest pytest-cov coveralls pycodestyle $TEST_DEPENDS
- pip install pytest-regressions
- mamba update -q mamba
- mamba info -a
# write travis python version into selected test environment definition file
- sed -e "s/\${TRAVIS_PYTHON_VERSION}/${TRAVIS_PYTHON_VERSION}/" conda-environments/${TEST_ENV}.yml > conda-env.yml
# create test environment in one pass
- mamba env create -n asimtest --file conda-env.yml
- conda activate asimtest
- pip install .
- pip freeze

script:
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
Expand All@@ -53,7 +56,7 @@ script:
after_success:
- coveralls
# Build docs
- pip install sphinx numpydoc sphinx_rtd_theme
- mamba install sphinx numpydoc sphinx_rtd_theme
- cd docs
- make clean
- make html
Expand Down

1 change: 0 additions & 1 deletion
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@

import numpy as np
import pandas as pd
from zbox import toolz as tz, gen

from activitysim.core import simulate
from activitysim.core import pipeline
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -553,6 +553,12 @@ def filter_warnings():
 warnings.filterwarnings('ignore', category=DeprecationWarning, module='tables',
 message='`np.object` is a deprecated alias')

 # beginning pandas version 1.3, various places emit a PerformanceWarning that is
 # caught in the "strict" filter above, but which are currently unavoidable for complex models.
 # These warning are left as warnings as an invitation for future enhancement.
 from pandas.errors import PerformanceWarning
 warnings.filterwarnings('default', category=PerformanceWarning)


def handle_standard_args(parser=None):

Expand Down

21 changes: 7 additions & 14 deletions
activitysim/core/inject.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,7 @@
# See full license in LICENSE.txt.
import logging

try:
 # use orca module if installed
 import orca
 import orca.orca as _ORCA
except ModuleNotFoundError:
 # otherwise use local copy
 from . import orca
 from . import orca as _ORCA
from orca import orca

_DECORATED_STEPS = {}
_DECORATED_TABLES = {}
Expand DownExpand Up@@ -135,7 +128,7 @@ def get_injectable(name, default=_NO_DEFAULT):

def remove_injectable(name):

_ORCA._INJECTABLES.pop(name, None)
orca._INJECTABLES.pop(name, None)


def reinject_decorated_tables():
Expand All@@ -146,10 +139,10 @@ def reinject_decorated_tables():
 logger.info("reinject_decorated_tables")

 # need to clear any non-decorated tables that were added during the previous run
_ORCA._TABLES.clear()
_ORCA._COLUMNS.clear()
_ORCA._TABLE_CACHE.clear()
_ORCA._COLUMN_CACHE.clear()
orca._TABLES.clear()
orca._COLUMNS.clear()
orca._TABLE_CACHE.clear()
orca._COLUMN_CACHE.clear()

 for name, func in _DECORATED_TABLES.items():
 logger.debug("reinject decorated table %s" % name)
Expand DownExpand Up@@ -189,4 +182,4 @@ def get_step_arg(arg_name, default=_NO_DEFAULT):
def dump_state():

 print("_DECORATED_STEPS", list(_DECORATED_STEPS.keys()))
 print("_ORCA._STEPS", list(_ORCA._STEPS.keys()))
 print("orca._STEPS", list(orca._STEPS.keys()))
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Improved distribution system for conda-forge and pip#440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jpn--
wants to merge
15
commits into

from

 Closed


Improved distribution system for conda-forge and pip
#440
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
91f4583

excise orca


jpn-- Jun 21, 2021
d0835e4

excise zbox


jpn-- Jun 21, 2021
a450030

travis to use conda


jpn-- Jun 21, 2021
575b31a

see if mamba will work better


jpn-- Jun 21, 2021
a2142a4

openmatrix in cf


jpn-- Jun 21, 2021
9539728

epic battle against travis continues


jpn-- Jun 21, 2021
298c5a4

more small errors on travis script


jpn-- Jun 21, 2021
0dd64d0

fix template for pandas 1.3


jpn-- Jul 8, 2021
252b741

don't make PerformanceWarnings into errors


jpn-- Jul 8, 2021
23fa7d6

getting started


jpn-- Jul 8, 2021
ced5d84

for pycodestyle


jpn-- Jul 8, 2021
693a6bb

alt install instructions


jpn-- Jul 8, 2021
93604cf

fix larch+asim for pandas 1.3


jpn-- Jul 9, 2021
7f33001

pycodestyle


jpn-- Jul 9, 2021
74b1fcc

add a bit more wiggle to larch regression tolerance


jpn-- Jul 9, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 15 additions & 12 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,15 @@ env:
 global:
 # GH_TOKEN ActivitySim/activitysim public_repo token
 - secure: WZeCAmI08hBRgtVWUlerfizvSpOVlBxQDa/Z6HJiDUlIXdSAOIi7TAwnluOgs3lHbSqACegbLCU9CyIQa/ytwmmuwzltkSQN14EcnKea0bXyygd8DFdx4x8st8M3a4nh2svgp4BDM9PCu6T1XIZ1rYM46JsKzNk9X8GpWOVN498=
 - TEST_ENV=activitysim-test
 jobs:
 # Add new TEST_SUITE jobs as needed via Travis build matrix expansion
 # define an alternative TEST_ENV to add special dependencies for particular tests
 - TEST_SUITE=activitysim/abm/models
 - TEST_SUITE=activitysim/abm/test
 - TEST_SUITE=activitysim/cli
 - TEST_SUITE=activitysim/core
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_DEPENDS="larch>=5.5.3 -c conda-forge"
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_ENV="activitysim-test-larch"
 - TEST_SUITE=activitysim/examples/example_mtc/test
 - TEST_SUITE=activitysim/examples/example_multiple_zone/test
 - TEST_SUITE=activitysim/examples/example_marin/test
Expand All@@ -25,26 +27,27 @@ python:
 - '3.8'

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- wget -O Mambaforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
- bash Mambaforge.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- conda activate test-environment
- conda install pytest pytest-cov coveralls pycodestyle $TEST_DEPENDS
- pip install pytest-regressions
- mamba update -q mamba
- mamba info -a
# write travis python version into selected test environment definition file
- sed -e "s/\${TRAVIS_PYTHON_VERSION}/${TRAVIS_PYTHON_VERSION}/" conda-environments/${TEST_ENV}.yml > conda-env.yml
# create test environment in one pass
- mamba env create -n asimtest --file conda-env.yml
- conda activate asimtest
- pip install .
- pip freeze

script:
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
Expand All@@ -53,7 +56,7 @@ script:
after_success:
- coveralls
# Build docs
- pip install sphinx numpydoc sphinx_rtd_theme
- mamba install sphinx numpydoc sphinx_rtd_theme
- cd docs
- make clean
- make html
Expand Down

1 change: 0 additions & 1 deletion
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@

import numpy as np
import pandas as pd
from zbox import toolz as tz, gen

from activitysim.core import simulate
from activitysim.core import pipeline
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -553,6 +553,12 @@ def filter_warnings():
 warnings.filterwarnings('ignore', category=DeprecationWarning, module='tables',
 message='`np.object` is a deprecated alias')

 # beginning pandas version 1.3, various places emit a PerformanceWarning that is
 # caught in the "strict" filter above, but which are currently unavoidable for complex models.
 # These warning are left as warnings as an invitation for future enhancement.
 from pandas.errors import PerformanceWarning
 warnings.filterwarnings('default', category=PerformanceWarning)


def handle_standard_args(parser=None):

Expand Down

21 changes: 7 additions & 14 deletions
activitysim/core/inject.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,7 @@
# See full license in LICENSE.txt.
import logging

try:
 # use orca module if installed
 import orca
 import orca.orca as _ORCA
except ModuleNotFoundError:
 # otherwise use local copy
 from . import orca
 from . import orca as _ORCA
from orca import orca

_DECORATED_STEPS = {}
_DECORATED_TABLES = {}
Expand DownExpand Up@@ -135,7 +128,7 @@ def get_injectable(name, default=_NO_DEFAULT):

def remove_injectable(name):

_ORCA._INJECTABLES.pop(name, None)
orca._INJECTABLES.pop(name, None)


def reinject_decorated_tables():
Expand All@@ -146,10 +139,10 @@ def reinject_decorated_tables():
 logger.info("reinject_decorated_tables")

 # need to clear any non-decorated tables that were added during the previous run
_ORCA._TABLES.clear()
_ORCA._COLUMNS.clear()
_ORCA._TABLE_CACHE.clear()
_ORCA._COLUMN_CACHE.clear()
orca._TABLES.clear()
orca._COLUMNS.clear()
orca._TABLE_CACHE.clear()
orca._COLUMN_CACHE.clear()

 for name, func in _DECORATED_TABLES.items():
 logger.debug("reinject decorated table %s" % name)
Expand DownExpand Up@@ -189,4 +182,4 @@ def get_step_arg(arg_name, default=_NO_DEFAULT):
def dump_state():

 print("_DECORATED_STEPS", list(_DECORATED_STEPS.keys()))
 print("_ORCA._STEPS", list(_ORCA._STEPS.keys()))
 print("orca._STEPS", list(orca._STEPS.keys()))
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Improved distribution system for conda-forge and pip#440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jpn--
wants to merge
15
commits into

from

 Closed


Improved distribution system for conda-forge and pip
#440
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
91f4583

excise orca


jpn-- Jun 21, 2021
d0835e4

excise zbox


jpn-- Jun 21, 2021
a450030

travis to use conda


jpn-- Jun 21, 2021
575b31a

see if mamba will work better


jpn-- Jun 21, 2021
a2142a4

openmatrix in cf


jpn-- Jun 21, 2021
9539728

epic battle against travis continues


jpn-- Jun 21, 2021
298c5a4

more small errors on travis script


jpn-- Jun 21, 2021
0dd64d0

fix template for pandas 1.3


jpn-- Jul 8, 2021
252b741

don't make PerformanceWarnings into errors


jpn-- Jul 8, 2021
23fa7d6

getting started


jpn-- Jul 8, 2021
ced5d84

for pycodestyle


jpn-- Jul 8, 2021
693a6bb

alt install instructions


jpn-- Jul 8, 2021
93604cf

fix larch+asim for pandas 1.3


jpn-- Jul 9, 2021
7f33001

pycodestyle


jpn-- Jul 9, 2021
74b1fcc

add a bit more wiggle to larch regression tolerance


jpn-- Jul 9, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 15 additions & 12 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,15 @@ env:
 global:
 # GH_TOKEN ActivitySim/activitysim public_repo token
 - secure: WZeCAmI08hBRgtVWUlerfizvSpOVlBxQDa/Z6HJiDUlIXdSAOIi7TAwnluOgs3lHbSqACegbLCU9CyIQa/ytwmmuwzltkSQN14EcnKea0bXyygd8DFdx4x8st8M3a4nh2svgp4BDM9PCu6T1XIZ1rYM46JsKzNk9X8GpWOVN498=
 - TEST_ENV=activitysim-test
 jobs:
 # Add new TEST_SUITE jobs as needed via Travis build matrix expansion
 # define an alternative TEST_ENV to add special dependencies for particular tests
 - TEST_SUITE=activitysim/abm/models
 - TEST_SUITE=activitysim/abm/test
 - TEST_SUITE=activitysim/cli
 - TEST_SUITE=activitysim/core
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_DEPENDS="larch>=5.5.3 -c conda-forge"
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_ENV="activitysim-test-larch"
 - TEST_SUITE=activitysim/examples/example_mtc/test
 - TEST_SUITE=activitysim/examples/example_multiple_zone/test
 - TEST_SUITE=activitysim/examples/example_marin/test
Expand All@@ -25,26 +27,27 @@ python:
 - '3.8'

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- wget -O Mambaforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
- bash Mambaforge.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- conda activate test-environment
- conda install pytest pytest-cov coveralls pycodestyle $TEST_DEPENDS
- pip install pytest-regressions
- mamba update -q mamba
- mamba info -a
# write travis python version into selected test environment definition file
- sed -e "s/\${TRAVIS_PYTHON_VERSION}/${TRAVIS_PYTHON_VERSION}/" conda-environments/${TEST_ENV}.yml > conda-env.yml
# create test environment in one pass
- mamba env create -n asimtest --file conda-env.yml
- conda activate asimtest
- pip install .
- pip freeze

script:
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
Expand All@@ -53,7 +56,7 @@ script:
after_success:
- coveralls
# Build docs
- pip install sphinx numpydoc sphinx_rtd_theme
- mamba install sphinx numpydoc sphinx_rtd_theme
- cd docs
- make clean
- make html
Expand Down

1 change: 0 additions & 1 deletion
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@

import numpy as np
import pandas as pd
from zbox import toolz as tz, gen

from activitysim.core import simulate
from activitysim.core import pipeline
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -553,6 +553,12 @@ def filter_warnings():
 warnings.filterwarnings('ignore', category=DeprecationWarning, module='tables',
 message='`np.object` is a deprecated alias')

 # beginning pandas version 1.3, various places emit a PerformanceWarning that is
 # caught in the "strict" filter above, but which are currently unavoidable for complex models.
 # These warning are left as warnings as an invitation for future enhancement.
 from pandas.errors import PerformanceWarning
 warnings.filterwarnings('default', category=PerformanceWarning)


def handle_standard_args(parser=None):

Expand Down

21 changes: 7 additions & 14 deletions
activitysim/core/inject.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,7 @@
# See full license in LICENSE.txt.
import logging

try:
 # use orca module if installed
 import orca
 import orca.orca as _ORCA
except ModuleNotFoundError:
 # otherwise use local copy
 from . import orca
 from . import orca as _ORCA
from orca import orca

_DECORATED_STEPS = {}
_DECORATED_TABLES = {}
Expand DownExpand Up@@ -135,7 +128,7 @@ def get_injectable(name, default=_NO_DEFAULT):

def remove_injectable(name):

_ORCA._INJECTABLES.pop(name, None)
orca._INJECTABLES.pop(name, None)


def reinject_decorated_tables():
Expand All@@ -146,10 +139,10 @@ def reinject_decorated_tables():
 logger.info("reinject_decorated_tables")

 # need to clear any non-decorated tables that were added during the previous run
_ORCA._TABLES.clear()
_ORCA._COLUMNS.clear()
_ORCA._TABLE_CACHE.clear()
_ORCA._COLUMN_CACHE.clear()
orca._TABLES.clear()
orca._COLUMNS.clear()
orca._TABLE_CACHE.clear()
orca._COLUMN_CACHE.clear()

 for name, func in _DECORATED_TABLES.items():
 logger.debug("reinject decorated table %s" % name)
Expand DownExpand Up@@ -189,4 +182,4 @@ def get_step_arg(arg_name, default=_NO_DEFAULT):
def dump_state():

 print("_DECORATED_STEPS", list(_DECORATED_STEPS.keys()))
 print("_ORCA._STEPS", list(_ORCA._STEPS.keys()))
 print("orca._STEPS", list(orca._STEPS.keys()))
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Improved distribution system for conda-forge and pip#440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jpn--
wants to merge
15
commits into

from

 Closed


Improved distribution system for conda-forge and pip
#440
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
91f4583

excise orca


jpn-- Jun 21, 2021
d0835e4

excise zbox


jpn-- Jun 21, 2021
a450030

travis to use conda


jpn-- Jun 21, 2021
575b31a

see if mamba will work better


jpn-- Jun 21, 2021
a2142a4

openmatrix in cf


jpn-- Jun 21, 2021
9539728

epic battle against travis continues


jpn-- Jun 21, 2021
298c5a4

more small errors on travis script


jpn-- Jun 21, 2021
0dd64d0

fix template for pandas 1.3


jpn-- Jul 8, 2021
252b741

don't make PerformanceWarnings into errors


jpn-- Jul 8, 2021
23fa7d6

getting started


jpn-- Jul 8, 2021
ced5d84

for pycodestyle


jpn-- Jul 8, 2021
693a6bb

alt install instructions


jpn-- Jul 8, 2021
93604cf

fix larch+asim for pandas 1.3


jpn-- Jul 9, 2021
7f33001

pycodestyle


jpn-- Jul 9, 2021
74b1fcc

add a bit more wiggle to larch regression tolerance


jpn-- Jul 9, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 15 additions & 12 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,15 @@ env:
 global:
 # GH_TOKEN ActivitySim/activitysim public_repo token
 - secure: WZeCAmI08hBRgtVWUlerfizvSpOVlBxQDa/Z6HJiDUlIXdSAOIi7TAwnluOgs3lHbSqACegbLCU9CyIQa/ytwmmuwzltkSQN14EcnKea0bXyygd8DFdx4x8st8M3a4nh2svgp4BDM9PCu6T1XIZ1rYM46JsKzNk9X8GpWOVN498=
 - TEST_ENV=activitysim-test
 jobs:
 # Add new TEST_SUITE jobs as needed via Travis build matrix expansion
 # define an alternative TEST_ENV to add special dependencies for particular tests
 - TEST_SUITE=activitysim/abm/models
 - TEST_SUITE=activitysim/abm/test
 - TEST_SUITE=activitysim/cli
 - TEST_SUITE=activitysim/core
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_DEPENDS="larch>=5.5.3 -c conda-forge"
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_ENV="activitysim-test-larch"
 - TEST_SUITE=activitysim/examples/example_mtc/test
 - TEST_SUITE=activitysim/examples/example_multiple_zone/test
 - TEST_SUITE=activitysim/examples/example_marin/test
Expand All@@ -25,26 +27,27 @@ python:
 - '3.8'

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- wget -O Mambaforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
- bash Mambaforge.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- conda activate test-environment
- conda install pytest pytest-cov coveralls pycodestyle $TEST_DEPENDS
- pip install pytest-regressions
- mamba update -q mamba
- mamba info -a
# write travis python version into selected test environment definition file
- sed -e "s/\${TRAVIS_PYTHON_VERSION}/${TRAVIS_PYTHON_VERSION}/" conda-environments/${TEST_ENV}.yml > conda-env.yml
# create test environment in one pass
- mamba env create -n asimtest --file conda-env.yml
- conda activate asimtest
- pip install .
- pip freeze

script:
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
Expand All@@ -53,7 +56,7 @@ script:
after_success:
- coveralls
# Build docs
- pip install sphinx numpydoc sphinx_rtd_theme
- mamba install sphinx numpydoc sphinx_rtd_theme
- cd docs
- make clean
- make html
Expand Down

1 change: 0 additions & 1 deletion
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@

import numpy as np
import pandas as pd
from zbox import toolz as tz, gen

from activitysim.core import simulate
from activitysim.core import pipeline
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -553,6 +553,12 @@ def filter_warnings():
 warnings.filterwarnings('ignore', category=DeprecationWarning, module='tables',
 message='`np.object` is a deprecated alias')

 # beginning pandas version 1.3, various places emit a PerformanceWarning that is
 # caught in the "strict" filter above, but which are currently unavoidable for complex models.
 # These warning are left as warnings as an invitation for future enhancement.
 from pandas.errors import PerformanceWarning
 warnings.filterwarnings('default', category=PerformanceWarning)


def handle_standard_args(parser=None):

Expand Down

21 changes: 7 additions & 14 deletions
activitysim/core/inject.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,7 @@
# See full license in LICENSE.txt.
import logging

try:
 # use orca module if installed
 import orca
 import orca.orca as _ORCA
except ModuleNotFoundError:
 # otherwise use local copy
 from . import orca
 from . import orca as _ORCA
from orca import orca

_DECORATED_STEPS = {}
_DECORATED_TABLES = {}
Expand DownExpand Up@@ -135,7 +128,7 @@ def get_injectable(name, default=_NO_DEFAULT):

def remove_injectable(name):

_ORCA._INJECTABLES.pop(name, None)
orca._INJECTABLES.pop(name, None)


def reinject_decorated_tables():
Expand All@@ -146,10 +139,10 @@ def reinject_decorated_tables():
 logger.info("reinject_decorated_tables")

 # need to clear any non-decorated tables that were added during the previous run
_ORCA._TABLES.clear()
_ORCA._COLUMNS.clear()
_ORCA._TABLE_CACHE.clear()
_ORCA._COLUMN_CACHE.clear()
orca._TABLES.clear()
orca._COLUMNS.clear()
orca._TABLE_CACHE.clear()
orca._COLUMN_CACHE.clear()

 for name, func in _DECORATED_TABLES.items():
 logger.debug("reinject decorated table %s" % name)
Expand DownExpand Up@@ -189,4 +182,4 @@ def get_step_arg(arg_name, default=_NO_DEFAULT):
def dump_state():

 print("_DECORATED_STEPS", list(_DECORATED_STEPS.keys()))
 print("_ORCA._STEPS", list(_ORCA._STEPS.keys()))
 print("orca._STEPS", list(orca._STEPS.keys()))
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Improved distribution system for conda-forge and pip#440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jpn--
wants to merge
15
commits into

from

 Closed


Improved distribution system for conda-forge and pip
#440
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
91f4583

excise orca


jpn-- Jun 21, 2021
d0835e4

excise zbox


jpn-- Jun 21, 2021
a450030

travis to use conda


jpn-- Jun 21, 2021
575b31a

see if mamba will work better


jpn-- Jun 21, 2021
a2142a4

openmatrix in cf


jpn-- Jun 21, 2021
9539728

epic battle against travis continues


jpn-- Jun 21, 2021
298c5a4

more small errors on travis script


jpn-- Jun 21, 2021
0dd64d0

fix template for pandas 1.3


jpn-- Jul 8, 2021
252b741

don't make PerformanceWarnings into errors


jpn-- Jul 8, 2021
23fa7d6

getting started


jpn-- Jul 8, 2021
ced5d84

for pycodestyle


jpn-- Jul 8, 2021
693a6bb

alt install instructions


jpn-- Jul 8, 2021
93604cf

fix larch+asim for pandas 1.3


jpn-- Jul 9, 2021
7f33001

pycodestyle


jpn-- Jul 9, 2021
74b1fcc

add a bit more wiggle to larch regression tolerance


jpn-- Jul 9, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 15 additions & 12 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,15 @@ env:
 global:
 # GH_TOKEN ActivitySim/activitysim public_repo token
 - secure: WZeCAmI08hBRgtVWUlerfizvSpOVlBxQDa/Z6HJiDUlIXdSAOIi7TAwnluOgs3lHbSqACegbLCU9CyIQa/ytwmmuwzltkSQN14EcnKea0bXyygd8DFdx4x8st8M3a4nh2svgp4BDM9PCu6T1XIZ1rYM46JsKzNk9X8GpWOVN498=
 - TEST_ENV=activitysim-test
 jobs:
 # Add new TEST_SUITE jobs as needed via Travis build matrix expansion
 # define an alternative TEST_ENV to add special dependencies for particular tests
 - TEST_SUITE=activitysim/abm/models
 - TEST_SUITE=activitysim/abm/test
 - TEST_SUITE=activitysim/cli
 - TEST_SUITE=activitysim/core
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_DEPENDS="larch>=5.5.3 -c conda-forge"
 - TEST_SUITE=activitysim/estimation/test/test_larch_estimation.py TEST_ENV="activitysim-test-larch"
 - TEST_SUITE=activitysim/examples/example_mtc/test
 - TEST_SUITE=activitysim/examples/example_multiple_zone/test
 - TEST_SUITE=activitysim/examples/example_marin/test
Expand All@@ -25,26 +27,27 @@ python:
 - '3.8'

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- wget -O Mambaforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
- bash Mambaforge.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- conda activate test-environment
- conda install pytest pytest-cov coveralls pycodestyle $TEST_DEPENDS
- pip install pytest-regressions
- mamba update -q mamba
- mamba info -a
# write travis python version into selected test environment definition file
- sed -e "s/\${TRAVIS_PYTHON_VERSION}/${TRAVIS_PYTHON_VERSION}/" conda-environments/${TEST_ENV}.yml > conda-env.yml
# create test environment in one pass
- mamba env create -n asimtest --file conda-env.yml
- conda activate asimtest
- pip install .
- pip freeze

script:
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/test-environment/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
Expand All@@ -53,7 +56,7 @@ script:
after_success:
- coveralls
# Build docs
- pip install sphinx numpydoc sphinx_rtd_theme
- mamba install sphinx numpydoc sphinx_rtd_theme
- cd docs
- make clean
- make html
Expand Down

1 change: 0 additions & 1 deletion
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@

import numpy as np
import pandas as pd
from zbox import toolz as tz, gen

from activitysim.core import simulate
from activitysim.core import pipeline
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -553,6 +553,12 @@ def filter_warnings():
 warnings.filterwarnings('ignore', category=DeprecationWarning, module='tables',
 message='`np.object` is a deprecated alias')

 # beginning pandas version 1.3, various places emit a PerformanceWarning that is
 # caught in the "strict" filter above, but which are currently unavoidable for complex models.
 # These warning are left as warnings as an invitation for future enhancement.
 from pandas.errors import PerformanceWarning
 warnings.filterwarnings('default', category=PerformanceWarning)


def handle_standard_args(parser=None):

Expand Down

21 changes: 7 additions & 14 deletions
activitysim/core/inject.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,7 @@
# See full license in LICENSE.txt.
import logging

try:
 # use orca module if installed
 import orca
 import orca.orca as _ORCA
except ModuleNotFoundError:
 # otherwise use local copy
 from . import orca
 from . import orca as _ORCA
from orca import orca

_DECORATED_STEPS = {}
_DECORATED_TABLES = {}
Expand DownExpand Up@@ -135,7 +128,7 @@ def get_injectable(name, default=_NO_DEFAULT):

def remove_injectable(name):

_ORCA._INJECTABLES.pop(name, None)
orca._INJECTABLES.pop(name, None)


def reinject_decorated_tables():
Expand All@@ -146,10 +139,10 @@ def reinject_decorated_tables():
 logger.info("reinject_decorated_tables")

 # need to clear any non-decorated tables that were added during the previous run
_ORCA._TABLES.clear()
_ORCA._COLUMNS.clear()
_ORCA._TABLE_CACHE.clear()
_ORCA._COLUMN_CACHE.clear()
orca._TABLES.clear()
orca._COLUMNS.clear()
orca._TABLE_CACHE.clear()
orca._COLUMN_CACHE.clear()

 for name, func in _DECORATED_TABLES.items():
 logger.debug("reinject decorated table %s" % name)
Expand DownExpand Up@@ -189,4 +182,4 @@ def get_step_arg(arg_name, default=_NO_DEFAULT):
def dump_state():

 print("_DECORATED_STEPS", list(_DECORATED_STEPS.keys()))
 print("_ORCA._STEPS", list(_ORCA._STEPS.keys()))
 print("orca._STEPS", list(orca._STEPS.keys()))
Loading