Skip to content

Commit

Permalink
Bump Numpy version and fix complex type
Browse files Browse the repository at this point in the history
  • Loading branch information
WolfByttner committed Apr 5, 2024
1 parent d4c5ff3 commit 48e6687
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 42 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "windows-latest"]
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- name: Set up Miniconda ${{ matrix.python-version }}
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: test
channels: conda-forge,defaults
environment-file: environment.yml
python-version: 3.8
python-version: ${{ matrix.python-version }}
auto-activate-base: false
cache-dependencies: true
- shell: bash -l {0}
run: |
conda info
Expand All @@ -44,6 +47,7 @@ jobs:
conda install pytest
py.test . --cov-report=xml --cov=traja -vvv
- name: Upload coverage to Codecov
if: ${{ matrix.python-version }} == '3.8'
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,4 @@ docs/source/reference

# Model parameter files
*.pt
.python-version
20 changes: 10 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
pandas>=1.2.0
numpy==1.18.5
matplotlib
shapely
scipy>=1.4.1
fastdtw
networkx
seaborn
torch
statsmodels
scikit-learn
numpy>=1.22.0
matplotlib>=3.3.3
shapely>=1.7.1
scipy>=1.2.1
fastdtw>=0.3.0
networkx>=2.0
seaborn>=0.11.0
torch>=1.7.0
statsmodels>=0.12.0
scikit-learn>=0.24.0
30 changes: 15 additions & 15 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
pandas>=1.2.0
numpy==1.18.5
matplotlib
shapely
scipy
scikit-learn
sphinx
sphinx-gallery
sphinx_rtd_theme
fastdtw
networkx
seaborn
torch
pytest
pytest-cov
codecov
ipython
matplotlib>=3.3.3
shapely>=1.7.1
scipy>=1.2.1
scikit-learn>=0.24.0
sphinx>=3.4.3
sphinx-gallery>=0.9.0
sphinx_rtd_theme>=0.5.1
fastdtw>=0.3.0
networkx>=2.0
seaborn>=0.11.0
torch>=1.7.0
pytest>=6.2.2
pytest-cov>=2.11.1
codecov>=2.1.11
ipython>=7.20.0
19 changes: 6 additions & 13 deletions requirements/extra.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
# extended list of package dependencies to reach full functionality

pytest
h5py
ipython
pre-commit
shapely
scipy>=1.4.1
scikit-learn
fastdtw
networkx
seaborn
torch
h5py
numba>=0.50.0
pytest>=6.2.2
h5py>=2.10.0
ipython>=7.19.0
pre-commit>=2.9.3
h5py>=2.10.0
numba>=0.50.1
pyDOE2>=1.3.0
2 changes: 1 addition & 1 deletion traja/tests/test_trajectory.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import numpy.testing as npt
import pytest
from pandas.util.testing import assert_series_equal
from pandas.testing import assert_series_equal

import traja

Expand Down
2 changes: 1 addition & 1 deletion traja/trajectory.py
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ def generate(

if random:
# Accumulate angular errors
coords = np.zeros(n, dtype=np.complex)
coords = np.zeros(n, dtype=complex)
angle = 0
for i in range(n - 1):
angle += angular_errors[i]
Expand Down

0 comments on commit 48e6687

Please sign in to comment.