Skip to content

Commit

Permalink
Merge pull request #14 from CognitiveAtlas/remove_future_imports
Browse files Browse the repository at this point in the history
future install_aliases is broken in python3.12
  • Loading branch information
rwblair authored Jun 12, 2024
2 parents e58a964 + 53fe726 commit 6e61645
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 129 deletions.
99 changes: 0 additions & 99 deletions .circleci/config.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install .
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.py[codt]
doc/build
build/*
24 changes: 0 additions & 24 deletions circle.yml

This file was deleted.

3 changes: 0 additions & 3 deletions cognitiveatlas/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
import errno
import pandas

from future.standard_library import install_aliases
install_aliases()

from urllib.request import urlopen, Request
from urllib.error import HTTPError

Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
pandas
future
numpy
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name="cognitiveatlas",

# Version number (initial):
version="0.1.9",
version="0.1.10",

# Application author details:
author="Poldracklab",
Expand All @@ -25,6 +25,6 @@

keywords='cogniive atlas cognition behavioral paradigm ontology',

install_requires = ["numpy","pandas","future"]
install_requires = ["numpy","pandas"]

)

0 comments on commit 6e61645

Please sign in to comment.