Skip to content

Commit

Permalink
first attempt at converting IPArray to a money.XMoney extension type
Browse files Browse the repository at this point in the history
  • Loading branch information
philtweir committed Sep 21, 2019
1 parent 0db23fc commit 0467687
Show file tree
Hide file tree
Showing 35 changed files with 977 additions and 1,806 deletions.
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
BSD 3-Clause License

Copyright (c) 2018, Anaconda, Inc.
Cyberpandas Copyright (c) 2018, Anaconda, Inc.
Moneypandas Copyright (c) 2019-, Flax & Teal Limited
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: build-cyberpandas all
.PHONY: build-moneypandas all

all: build-cyberpandas
all: build-moneypandas

build-cyberpandas-%:
LDFLAGS="-headerpad_max_install_name" conda build conda-recipes/cyberpandas $(patsubst build-cyberpandas-%,--python=%,$@)
build-moneypandas-%:
LDFLAGS="-headerpad_max_install_name" conda build conda-recipes/moneypandas $(patsubst build-moneypandas-%,--python=%,$@)
11 changes: 11 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]

[dev-packages]

[requires]
python_version = "3.6"
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Moneypandas

Moneypandas is a prototype fork of Cyberpandas for currency, using the `money` library.

----

# Cyberpandas

[![Build Status](https://travis-ci.org/ContinuumIO/cyberpandas.svg?branch=master)](https://travis-ci.org/ContinuumIO/cyberpandas)
Expand Down
4 changes: 2 additions & 2 deletions ci/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -e
echo "Building cyberpandas"
echo "Building moneypandas"

conda build -c defaults -c conda-forge conda-recipes/cyberpandas --python=${PYTHON}
conda build -c defaults -c conda-forge conda-recipes/moneypandas --python=${PYTHON}
2 changes: 1 addition & 1 deletion ci/environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: cyberpandas-docs
name: moneypandas-docs
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/install-travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ conda list test-environment
python -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);'

echo
echo "[install cyberpandas]"
echo "[install moneypandas]"
pip install --no-deps -e .

echo "[finished install]"
Expand Down
4 changes: 2 additions & 2 deletions ci/upload-anaconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ if [ -z "$UPLOAD_KEY" ]; then
return 0
fi

export UPLOADFILE=`conda build conda-recipes/cyberpandas --python=${PYTHON} --output`
export UPLOADFILE=`conda build conda-recipes/moneypandas --python=${PYTHON} --output`
echo "UPLOADFILE = ${UPLOADFILE}"

echo "[Upload cyberpandas]"
echo "[Upload moneypandas]"
echo ${UPLOADFILE}
anaconda -t ${UPLOAD_KEY} upload -u intake --force ${UPLOADFILE}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package:
name: cyberpandas
name: moneypandas
version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}

build:
Expand All @@ -18,15 +18,15 @@ requirements:
- setuptools >=3.3

run:
- ipaddress # [py27]
- money
- pandas >=0.23.0
- python
- setuptools >=3.3

test:
imports:
- cyberpandas
- moneypandas

about:
home: https://github.com/continuumio/cyberpandas
home: https://github.com/flaxandteal/moneypandas
license: BSD
30 changes: 0 additions & 30 deletions cyberpandas/_utils.py

This file was deleted.

3 changes: 0 additions & 3 deletions cyberpandas/common.py

This file was deleted.

17 changes: 0 additions & 17 deletions cyberpandas/dtypes.py

This file was deleted.

Loading

0 comments on commit 0467687

Please sign in to comment.